Michael Große 3f9d4d521a Merge branch 'master' into pageattributes ... Adjusted some more files to account for changes in the over 100 commits in master since the creation of this branch. SPR-869		2017-04-11 16:13:02 +02:00
..
favicon_tiles.php	SPR-787 use same logo resized	2017-02-20 16:21:45 +01:00
main-sidebar-logo.php	fix mobile sidebar not shown if there is no logo	2017-04-10 16:37:54 +02:00
main-sidebar-nav.php	Merge remote-tracking branch 'origin/mobilesidebar'	2017-03-02 12:11:51 +01:00
main-sidebar-search.php	made search toggle translatable	2017-02-22 14:17:33 +01:00
nav-breadcrumb.php	fixed line endings CRLF -> LF	2017-02-09 17:48:44 +01:00
nav-direct.php	SPR-797 fix ID uniqueness	2017-02-13 16:53:06 +01:00
nav-magicmatcher.php	SPR-797 fix ID uniqueness	2017-02-13 16:53:06 +01:00
nav-meta-box.php	Merge branch 'master' into pageattributes	2017-04-11 16:13:02 +02:00
nav-page-attributes.php	Merge branch 'master' into pageattributes	2017-04-11 16:13:02 +02:00
nav-page-tools.php	Add icon for odt-export	2017-04-10 12:28:08 +02:00
nav-status.php	fixed line endings CRLF -> LF	2017-02-09 17:48:44 +01:00
nav-usertools-buttons.php	SPR-863: better order for usertool icons	2017-03-21 15:23:28 +01:00