]> git.mxchange.org Git - friendica.git/commit
Merge develop into 0502_vier_dark
authorrabuzarus <>
Sat, 6 Feb 2016 12:09:41 +0000 (13:09 +0100)
committerrabuzarus <>
Sat, 6 Feb 2016 12:09:41 +0000 (13:09 +0100)
commit95819684c25b9f797fe42b728d4cbf478c33343e
tree8c41c8a3e50b48c77ffd7397937f38a56b70f1cb
parent0bccfea5968c5195a253bb7f2066145e0f539144
parent99c3db98a7f75585e9bdbb602dc8e31bfdba3999
Merge develop into 0502_vier_dark

Conflicts:
view/theme/vier/dark.css
view/theme/vier/dark.css
view/theme/vier/shadow.css