]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56b6003 6d50d18)
Merge develop into 1106-frio-settings
authorrabuzarus <trebor@central-unit>
Sun, 12 Jun 2016 17:34:06 +0000 (19:34 +0200)
committerrabuzarus <trebor@central-unit>
Sun, 12 Jun 2016 17:34:06 +0000 (19:34 +0200)

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