]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b141a60 86c442f)
Merge branch 'develop' of github.com:friendica/friendica into develop
authorBeanow <beanow@oscp.info>
Sun, 22 Mar 2015 14:13:30 +0000 (15:13 +0100)
committerBeanow <beanow@oscp.info>
Sun, 22 Mar 2015 14:13:30 +0000 (15:13 +0100)

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