Tom Fulton 5865b47482 Merge branch 'feature/allow-collapsing' into develop ...

Conflicts:
	app/controllers/controller.js

2014-03-06 12:05:34 -07:00

..

archetype.config.html

Merge branch 'feature/allow-collapsing' into develop

2014-03-06 12:05:34 -07:00

archetype.html

Hide carets when collapsing is disabled

2014-03-02 00:48:49 -07:00