]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8cced06 c4ddee0)
Merge branch 'omigeot-master'
authorFriendika <info@friendika.com>
Sat, 5 Feb 2011 21:01:28 +0000 (13:01 -0800)
committerFriendika <info@friendika.com>
Sat, 5 Feb 2011 21:01:28 +0000 (13:01 -0800)
Conflicts:
view/fr/strings.php


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.