]> git.mxchange.org Git - friendica.git/commit
Merge develop into 20170321_-_frio-fbbrowser
authorrabuzarus <trebor@central-unit>
Sun, 2 Apr 2017 22:51:34 +0000 (00:51 +0200)
committerrabuzarus <trebor@central-unit>
Sun, 2 Apr 2017 22:51:34 +0000 (00:51 +0200)
commitee293f2ce28270e1f8e05ce38991977d41e40c27
treec4cf1abeae6fc49a20b4e15f340e7156424af4f3
parent5e54fb3a5f0df4ce3178a7e081dca36c18e334fa
parent1ce5cc1b49650faa7b0981fa4d179feade042faa
Merge develop into 20170321_-_frio-fbbrowser

Conflicts:
view/theme/frio/js/filebrowser.js
view/theme/frio/js/theme.js
view/theme/frio/templates/filebrowser.tpl
view/theme/frio/templates/jot.tpl
view/theme/frio/css/mod_events.css
view/theme/frio/css/style.css
view/theme/frio/js/filebrowser.js
view/theme/frio/js/theme.js
view/theme/frio/templates/filebrowser.tpl
view/theme/frio/templates/jot.tpl