diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-08-11 21:28:30 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-08-11 21:28:30 +0400 |
| commit | d293408450bc8b0c0f79934da6a43914626935ae (patch) | |
| tree | e50c0df2f698b6033e13f963b9a16a01ef5bf020 /plugins/Zeitgeist | |
| parent | 3b74ae5cdac37e16315c3a24ecf2591f742ca3c7 (diff) | |
| parent | 2340530c1109a37527f3b8ad0b82e54e7a6eb137 (diff) | |
Merge branch 'plugin_namespaces'
Conflicts:
plugins/UserCountryMap/Controller.php
Diffstat (limited to 'plugins/Zeitgeist')
| -rw-r--r-- | plugins/Zeitgeist/stylesheets/base.css | 1 | ||||
| -rw-r--r-- | plugins/Zeitgeist/stylesheets/base.less | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/plugins/Zeitgeist/stylesheets/base.css b/plugins/Zeitgeist/stylesheets/base.css index 75a146eb12..3eea5ab03a 100644 --- a/plugins/Zeitgeist/stylesheets/base.css +++ b/plugins/Zeitgeist/stylesheets/base.css @@ -1,3 +1,4 @@ +/* TO GENERATE: lessc plugins/Zeitgeist/stylesheets/base.less plugins/Zeitgeist/stylesheets/base.css */ /* base.less is a standalone Less file */ /* base.css is automatically generated. DO NOT MODIFY */ /* General styles */ diff --git a/plugins/Zeitgeist/stylesheets/base.less b/plugins/Zeitgeist/stylesheets/base.less index 3d8406e360..f4afcc6220 100644 --- a/plugins/Zeitgeist/stylesheets/base.less +++ b/plugins/Zeitgeist/stylesheets/base.less @@ -1,3 +1,4 @@ +/* TO GENERATE: lessc plugins/Zeitgeist/stylesheets/base.less plugins/Zeitgeist/stylesheets/base.css */ /* base.less is a standalone Less file */ /* base.css is automatically generated. DO NOT MODIFY */ |