rabuzarus d39f679230 Merge develop into 1006-short-info ... Conflicts: view/theme/frio/js/theme.js		2016-06-11 10:52:26 +02:00
..
filebrowser.js
hovercard.js
modal.js
textedit.js
theme.js	Merge develop into 1006-short-info	2016-06-11 10:52:26 +02:00