]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd16eb1 a770be3)
Merge remote-tracking branch 'upstream/develop' into 1511-ostatus-bookmark-design
authorMichael Vogel <icarus@dabo.de>
Sun, 29 Nov 2015 09:25:44 +0000 (10:25 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 29 Nov 2015 09:25:44 +0000 (10:25 +0100)

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