]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into setup-rewrite-check
authorMichael Vogel <icarus@dabo.de>
Sun, 14 Jun 2015 22:55:05 +0000 (00:55 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 14 Jun 2015 22:55:05 +0000 (00:55 +0200)
commit0e157b128849f3ee803c88cc72e330751fba3efa
tree73ab9f0fa472ca9bb79dc600679e24c2865d6c42
parentb22296d454e8b3a8fbaffe69372fa73a175ae609
parent42f4f3fce9c914c79694d36f43a6baa0c46d3903
Merge remote-tracking branch 'upstream/develop' into setup-rewrite-check