Ben Word 73fa0de4d5 Merge branch 'master' into 8.0.0 ...

Conflicts:
	lib/sidebar.php

2015-02-19 11:18:49 -06:00

..

assets.php

Adds get_path method to JsonManifest

2015-01-31 12:08:13 -06:00

config.php

Update referenced file name

2015-01-27 16:40:38 -06:00

extras.php

Add namespace

2015-01-10 14:49:46 -06:00

gallery.php

Use short array syntax

2015-01-18 16:45:18 -06:00

init.php

use correct filename editor-style.css on dev or editor-style-*.css listed in manifest file for tinymce editor

2015-02-12 20:02:54 -06:00

nav.php

Migrate @Foxaii's nav-rejig for 8.0.0

2015-02-19 11:08:47 -06:00

sidebar.php

Merge branch 'master' into 8.0.0

2015-02-19 11:18:49 -06:00

titles.php

Add namespace

2015-01-10 14:49:46 -06:00

utils.php

Migrate @Foxaii's nav-rejig for 8.0.0

2015-02-19 11:08:47 -06:00

wrapper.php

Update PHP files to pass coding standards

2015-01-24 00:48:50 -06:00