Kevin Giszewski 42efa1a3d4 Merge branch 'pr/200' ...

Conflicts:
	app/directives/archetypeproperty.js

2014-08-18 09:43:06 -04:00

..

archetypecustomview.js

More caching

2014-08-12 19:15:08 -04:00

archetypeproperty.js

Merge branch 'pr/200'

2014-08-18 09:43:06 -04:00

localize.js

fix typo

2014-08-13 11:05:27 -04:00