kgiszewski f541b50b82 Merge branch 'master' into pr/356 ...

Conflicts:
	app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValue.cs
	app/controllers/config.controller.js
	app/views/archetype.config.fieldset.dialog.html

2016-05-13 10:07:18 -04:00

..

config.controller.js

Merge branch 'master' into pr/356

2016-05-13 10:07:18 -04:00

config.dialog.controller.js

Fix issue 342

2016-03-31 23:44:52 +02:00

controller.js

Merge branch 'master' into pr/356

2016-05-13 10:07:18 -04:00