Maikel Linke 903bd21577 Merge remote-tracking branch 'origin/master' into group-pages-merge ...

Conflicts:
	README.markdown
	db/schema.rb

2015-02-13 15:42:36 +11:00

..

admin

Show extended variant name/unit info for admin variant overrides

2015-01-29 15:15:28 +11:00

darkswarm

Merge remote-tracking branch 'origin/master' into group-pages-merge

2015-02-13 15:42:36 +11:00

mail

Make cost breakdowns consistent throughout checkout

2014-11-26 13:07:40 +11:00

shared

configure textAngular on enterprise edit page

2014-09-30 18:20:45 +10:00

store

return basic css and js for oldskool login that somehow still exists

2014-10-02 13:24:59 +10:00

application.css.scss

Starting to partialise things

2013-11-29 16:52:14 +11:00