Merge branch 'dev' into new_layout
Conflicts: app/assets/stylesheets/projects.css.scss
Showing
... | ... | @@ -28,6 +28,7 @@ group :assets do |
end | ||
group :development do | ||
gem 'letter_opener' | ||
gem 'rails-footnotes', '>= 3.7.5.rc4' | ||
gem 'annotate', :git => 'git://github.com/ctran/annotate_models.git' | ||
end | ||
... | ... |
想要评论请 注册 或 登录