]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45d8676 ea978af)
Merge branch 'fabrixxm-master'
authorFriendika <info@friendika.com>
Wed, 5 Jan 2011 00:42:11 +0000 (16:42 -0800)
committerFriendika <info@friendika.com>
Wed, 5 Jan 2011 00:42:11 +0000 (16:42 -0800)
1  2 
include/main.js patch | diff1 | diff2 | blob | history

diff --cc include/main.js
Simple merge
Unnamed repository; edit this file 'description' to name the repository.