]> git.mxchange.org Git - friendica-addons.git/commit
Merge remote-tracking branch 'upstream/master' into 1609-ignorelist-rendertime
authorMichael Vogel <ike@pirati.ca>
Thu, 15 Sep 2016 09:55:58 +0000 (09:55 +0000)
committerMichael Vogel <ike@pirati.ca>
Thu, 15 Sep 2016 09:55:58 +0000 (09:55 +0000)
commit73e98a4814098dec4b6212fdc750a30a0cb17ef0
treeffee7eb2143e9cdd15249b595f104817fba7c1a3
parent1ffa5387c5dd61dc8352de898b4c8ea0c1f8a591
parent48ee8b5c33e262aa6d442e7ac8e999535784f206
Merge remote-tracking branch 'upstream/master' into 1609-ignorelist-rendertime

Conflicts:
rendertime/rendertime.php
rendertime/rendertime.php