Merge pull request #728 from skattyadz/default-settings-validations

Browse source

Conflicts:
	Gruntfile.js
	core/server.js
	core/server/data/default-settings.json
	core/test/unit/admin_spec.js

...

This commit is contained in:

Hannah Wolfe 2013-09-14 14:37:52 +01:00

parent c46537de32 bf26dddce8

commit 4f5b9351d9

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

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available