WolFi e1e0ec7a76 Merge branch 'feature/noid/iconpickersearch' into feature/merges_v2.2.0		2018-12-16 14:07:58 +01:00
..
views	Merge branch 'feature/noid/iconpickersearch' into feature/merges_v2.2.0	2018-12-16 14:07:58 +01:00
admin.settings.php	Refactor settings, create SettingsService	2016-12-30 13:37:40 +01:00
bookmarklet.php	Fix bookmarklet	2016-12-22 18:34:44 +01:00
main.php	Renamed hidden to template-hidden in css styles	2018-12-04 22:55:12 +01:00
part.admin.php	Merge rakekniven-patch-3 and sign	2017-07-12 19:54:23 +02:00
public_share.php	Merge remote-tracking branch 'origin/fix_layout_for_14' into feature/merges_v2.2.0	2018-12-16 12:36:57 +01:00