Daniel Hensby a8ab5a468d Merge branch '3.1' into 3.2 ...

Conflicts:
	admin/code/LeftAndMain.php
	composer.json

2015-08-17 11:43:28 +01:00

..

code

Merge branch '3.1' into 3.2

2015-08-17 11:43:28 +01:00

css

FIX Missing thumbnails and inconsistencies

2015-07-30 16:15:51 -07:00

images

Tidy up loading gif

2015-06-09 13:41:21 +12:00

javascript

Update translations

2015-08-04 13:02:20 +12:00

scss

FIX Missing thumbnails and inconsistencies

2015-07-30 16:15:51 -07:00

templates

Merge branch '3.1' into 3.2

2015-08-17 11:43:28 +01:00

tests

Merge remote-tracking branch 'origin/3.1' into 3.2

2015-07-31 11:38:18 +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

Set default encoding for compass

2013-10-30 16:11:11 +00:00