]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12474e3 b13c6ea)
Merge branch 'master' of git://github.com/friendica/friendica
authorVasudev Kamath <kamathvasudev@gmail.com>
Mon, 4 Jun 2012 14:29:23 +0000 (19:59 +0530)
committerVasudev Kamath <kamathvasudev@gmail.com>
Mon, 4 Jun 2012 14:29:23 +0000 (19:59 +0530)

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