diff options
| author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-10-29 23:49:47 +0300 |
|---|---|---|
| committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-10-29 23:49:47 +0300 |
| commit | 37ea51e9ac2ea1e0f475f998f6df70fabf0996b7 (patch) | |
| tree | 8ce3b8b2b581459a140813e329ebe06043e9ac09 /.gitignore | |
| parent | 9365af1399b518f1f1d1217e8f9dc56febdd7a93 (diff) | |
| parent | f675be933cd4d16e760f3dd8906e721a92973b71 (diff) | |
Merge branch 'next'
Conflicts:
README.md
lib/bootstrap-sass.rb
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -14,6 +14,6 @@ Gemfile.lock tmp/ test/screenshots/ test/dummy_rails/log/*.log - +test/dummy_rails/public/assets/ .DS_Store node_modules |