]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 392b53d 1c88853)
Merge branch 'master' of https://github.com/friendica/friendica
authorhauke <hauke@grlg.org>
Sat, 6 Sep 2014 15:50:32 +0000 (17:50 +0200)
committerhauke <hauke@grlg.org>
Sat, 6 Sep 2014 15:50:32 +0000 (17:50 +0200)

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