mirror of
https://github.com/Poniverse/Pony.fm.git
synced 2024-11-25 14:37:59 +01:00
Merge branch 'origin/spa-master'
Conflicts: public/styles/app.less
This commit is contained in:
commit
18a9b30c64
1 changed files with 1 additions and 1 deletions
|
@ -8,4 +8,4 @@
|
||||||
@import 'forms';
|
@import 'forms';
|
||||||
@import 'tracks';
|
@import 'tracks';
|
||||||
@import 'albums';
|
@import 'albums';
|
||||||
@import 'animations';
|
@import 'animations';
|
Loading…
Reference in a new issue