diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 15:06:54 -0500 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 15:06:54 -0500 |
commit | 0d3a1f6030eec5631892ec733ec75001bfe2f9ff (patch) | |
tree | 00ad96fd52bcdebc2e96ebb3157e314b2466fc22 /app/assets/stylesheets/custom.css.scss | |
parent | 59b2dc33ea83d5d5a52a72d14213f564afe8f0ce (diff) | |
parent | 699bd065c06689a159c11ac3aacef6b34001617c (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
Gemfile.lock
app/views/layouts/application.html.erb
config/routes.rb
Diffstat (limited to 'app/assets/stylesheets/custom.css.scss')
-rw-r--r-- | app/assets/stylesheets/custom.css.scss | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss new file mode 100644 index 0000000..b0692d8 --- /dev/null +++ b/app/assets/stylesheets/custom.css.scss @@ -0,0 +1 @@ +@import "bootstrap";
\ No newline at end of file |