Merge branch 'origin/spa-master'

Conflicts:
	public/styles/app.less
This commit is contained in:
nelsonlaquet 2013-08-09 17:59:54 -05:00
commit 18a9b30c64

View file

@ -8,4 +8,4 @@
@import 'forms'; @import 'forms';
@import 'tracks'; @import 'tracks';
@import 'albums'; @import 'albums';
@import 'animations'; @import 'animations';