]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dbf8f71 4b2de6f)
Merge branch 'master' into fixes
authorOlaf Conradi <olaf@conradi.org>
Sun, 30 Dec 2012 00:30:00 +0000 (01:30 +0100)
committerOlaf Conradi <olaf@conradi.org>
Sun, 30 Dec 2012 00:30:00 +0000 (01:30 +0100)

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