Merge branch 'master' into ux/marco/studio-componentsettings
This commit is contained in:
2
cms/static/coffee/.gitignore
vendored
2
cms/static/coffee/.gitignore
vendored
@@ -1,3 +1 @@
|
||||
*.js
|
||||
descriptor
|
||||
module
|
||||
|
||||
2
cms/static/sass/.gitignore
vendored
2
cms/static/sass/.gitignore
vendored
@@ -1,3 +1 @@
|
||||
*.css
|
||||
descriptor
|
||||
module
|
||||
|
||||
Reference in New Issue
Block a user