社員情報更新
Merge pull request #1 from qtamaki/master

社員情報更新
Merge pull request #3 from jomjomni/master

View修正
流出メール機能モデル部分実装
fix conflict
fix conflict
#455 修正
Merge pull request #308 from jomjomni/develop

#455 修正
#455 修正
Merge pull request #309 from jomjomni/develop

#455 修正
popupの時はリンクやめる
Merge branch 'develop' of https://github.com/goldrush/goldrush into develop
specialwordsの単体テスト追加
Merge pull request #310 from jomjomni/develop

specialwordsの単体テスト追加
specialwordsの単体テスト追加
Merge pull request #311 from jomjomni/develop

specialwordsの単体テスト追加
add rmagick in Gemfile
Merge branch 'develop' of https://github.com/qtamaki/goldrush into develop
add better_errors
Merge pull request #312 from qtamaki/develop

Develop