Merge branch 'master' into product-amount-units

Conflicts:
	config/ng-test.conf.js
This commit is contained in:
Rohan Mitchell
2013-12-06 14:33:59 +11:00

View File

@@ -12,7 +12,7 @@
= render "layouts/bugherd_script"
= csrf_meta_tags
%body.off-canvas
%body
%nav.top-bar
%section.top-bar-section
%ul.left