]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce7217c 5d3613c)
Merge pull request #646 from annando/master
authorfermionic <fermion@gmx.com>
Sun, 10 Mar 2013 22:24:27 +0000 (15:24 -0700)
committerfermionic <fermion@gmx.com>
Sun, 10 Mar 2013 22:24:27 +0000 (15:24 -0700)
OStatus conversations, "vier" and diaspora android client


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