diff options
| author | spag <spag@golwen.net> | 2013-01-16 10:31:18 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2013-01-16 10:31:18 +0100 |
| commit | 1de09183010a7f021455ce69877b78051d5c4bf1 (patch) | |
| tree | 736f546009b2d85dcd470e044576442e464b93b1 /app/assets/stylesheets/application.css.scss | |
| parent | 473e6c52eff0576829138b59b99f83917ff6b0e9 (diff) | |
| parent | 8e16b8a24341fd579d97ce47512951a3d14250c1 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/assets/stylesheets/application.css.scss')
| -rw-r--r-- | app/assets/stylesheets/application.css.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 32e54f4..2aabd17 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -114,4 +114,4 @@ a.button { margin:10px 0;} @import "app/layouts/conference"; // Compatibility.. oh jeez. - @import "app/shared/ie";
\ No newline at end of file + @import "app/shared/ie"; |