rabuzarus ee293f2ce2 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
2017-04-03 00:51:34 +02:00
..
2017-04-01 17:08:11 +00:00
2017-01-15 15:06:32 +00:00
2017-03-26 13:12:02 +00:00
2017-01-15 15:18:31 +00:00
2017-03-25 21:07:12 +01:00
2017-02-26 23:16:49 +00:00