Daniel Hensby 84b70422b6 Merge branch '3' ...

Conflicts:
	.travis.yml

2015-08-18 16:41:21 +01:00

..

code

Merge branch '3'

2015-08-18 16:41:21 +01:00

css

Merge remote-tracking branch '3.2' into 3

2015-08-17 11:59:24 +00:00

font

Add three column layout to Page content view

2015-07-02 10:22:24 +12:00

images

Update button and tab styles

2015-07-15 10:35:21 +12:00

javascript

Merge remote-tracking branch '3.2' into 3

2015-08-17 11:59:24 +00:00

scss

Merge remote-tracking branch '3.2' into 3

2015-08-17 11:59:24 +00:00

templates

Merge remote-tracking branch '3.2' into 3

2015-08-17 11:59:24 +00:00

tests

Merge remote-tracking branch 'origin/3'

2015-07-31 15:49:35 +12:00

thirdparty

Updated history.js dependency

2013-03-20 00:46:32 +01:00

_config.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

.gitignore

MINOR Removing executable flag from all files (thanks miiihi)

2011-09-18 22:04:02 +02:00

config.rb

Update compass config

2015-07-09 10:11:00 +12:00