projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56dfa7b a2ab431)
Merge branch 'master' of https://github.com/friendica/friendica
authorhauke <hauke@grlg.org>
Sat, 6 Sep 2014 15:51:00 +0000 (17:51 +0200)
committerhauke <hauke@grlg.org>
Sat, 6 Sep 2014 15:51:00 +0000 (17:51 +0200)

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