]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f19d39 817fc37)
Merge branch 'master' of github.com:annando/friendica
authorMichael Vogel <icarus@dabo.de>
Sat, 26 May 2012 13:42:23 +0000 (15:42 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 26 May 2012 13:42:23 +0000 (15:42 +0200)

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