]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cbf1cab 7ea5917)
Merge branch 'master' of https://github.com/friendica/friendica
authorSebastian Egbers <sebastian@egbers.info>
Mon, 25 Jun 2012 11:59:39 +0000 (13:59 +0200)
committerSebastian Egbers <sebastian@egbers.info>
Mon, 25 Jun 2012 11:59:39 +0000 (13:59 +0200)

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