Commit 43e32baf authored by thaider's avatar thaider
Browse files

Merge branch 'master' into development

parents 76fc1e86 63d8cc6b
......@@ -52,6 +52,7 @@
"styles": "bs3/bootstrap/css/bootstrap.min.css"
},
"skins.tweeki.styles": {
"class": "ResourceLoaderSkinModule",
"position": "top",
"styles": {
"bs3/bootstrap/css/bootstrap.min.css": {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment