kjac d9ffb4b097 Merge remote-tracking branch 'refs/remotes/origin/master' into publishing ...

# Conflicts:
#	app/less/archetype.less

2016-04-03 12:53:30 +02:00

..

controllers

Merge remote-tracking branch 'refs/remotes/origin/master' into publishing

2016-04-03 12:53:30 +02:00

directives

Merge branch 'master' into pr/311

2016-03-22 11:36:37 -04:00

helpers

Renaming binge

2015-06-01 12:12:33 -04:00

langs

Create expandable settings group and fix icon activation

2016-03-20 13:21:43 +01:00

less

Merge remote-tracking branch 'refs/remotes/origin/master' into publishing

2016-04-03 12:53:30 +02:00

resources

Add dll version to the config page

2015-10-07 16:28:00 -04:00

services

Added native label for RJP.MultiUrlPicker data type

2016-03-15 10:28:14 +00:00

Umbraco

Merge remote-tracking branch 'refs/remotes/origin/master' into publishing

2016-04-03 12:53:30 +02:00

views

Merge remote-tracking branch 'refs/remotes/origin/master' into publishing

2016-04-03 12:53:30 +02:00