diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 10:58:41 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 10:58:41 -0400 |
| commit | 8593bcdf2471ce8d818e7b83e93fbe2d850f5029 (patch) | |
| tree | e64ea4aef665c5a172207d8f26737678a1c200a6 /app/assets | |
| parent | 33076ce4282d6dcb66fb83a2278668a6320b5845 (diff) | |
| parent | d7dd03e3b43510bc3a79e592f600d7cb239bc8ca (diff) | |
Merge branch 'clean2'
Conflicts:
config/initializers/mailboxer.rb
config/routes.rb
Diffstat (limited to 'app/assets')
0 files changed, 0 insertions, 0 deletions