Merge branch 'master' into refactor_styles

This commit is contained in:
Alberto Garcia Cabeza
2015-12-16 13:37:46 +01:00
39 changed files with 830 additions and 34 deletions

View File

@@ -7,4 +7,5 @@
@import "admin";
@import "layout";
@import "participation";
@import "c3";
@import "c3";
@import "annotator.min";