]> git.mxchange.org Git - friendica-addons.git/commitdiff
projects / friendica-addons.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5cfe5b 308e093)
Merge origin/develop into develop
authorPeter Liebetrau <peter.liebetrau@gmail.com>
Wed, 23 Jan 2019 09:49:20 +0000 (10:49 +0100)
committerPeter Liebetrau <peter.liebetrau@gmail.com>
Wed, 23 Jan 2019 09:49:20 +0000 (10:49 +0100)
1  2 
cookienotice/cookienotice.php patch | diff1 | diff2 | blob | history

diff --cc cookienotice/cookienotice.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.