]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e02b77c ce12ec3)
Merge branch 'develop' of https://github.com/friendica/friendica into develop
authorhauke <hauke@grlg.org>
Sat, 27 Dec 2014 11:50:24 +0000 (12:50 +0100)
committerhauke <hauke@grlg.org>
Sat, 27 Dec 2014 11:50:24 +0000 (12:50 +0100)

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