Aleksander Machniak f5a807291e Merge branch 'master' into manticore ... Conflicts: plugins/kolab_files/kolab_files.js		2015-11-10 10:55:30 +01:00
..
images	Implement folders searching and subscriptions support (T163)	2015-10-06 12:04:44 +02:00
templates	Merge branch 'master' into manticore	2015-11-10 10:55:30 +01:00
style.css	Merge branch 'master' into manticore	2015-11-10 10:55:30 +01:00
ui.js	Merge branch 'master' into manticore	2015-11-10 10:55:30 +01:00