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

..

archetype.config.developer.dialog.html

Fix issue 342

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

archetype.config.fieldset.dialog.html

Merge branch 'master' into pr/356

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

archetype.config.html

Add Twitter link

2015-10-08 08:07:35 -04:00

archetype.config.stylescript.dialog.html

Fix issue 342

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

archetype.default.html

Merge branch 'master' into pr/356

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

archetype.html

Version HTML

2015-10-07 17:34:35 -04:00