Merge branch '1.2'

Browse Source

Conflicts:
	public/build/rev-manifest.json

...

This commit is contained in:

Graham Campbell

2015-08-18 16:40:06 +01:00

parent a72033ffa2 860457bfae

commit d47121b93d

3 changed files with 31 additions and 31 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

public/build/dist/css/all-8ec09eab73.css → public/build/dist/css/all-6bdebe6448.css

Vendored Executable → Regular

+3 -3

File diff suppressed because one or more lines are too long