diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 02:49:34 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 02:49:34 -0400 |
| commit | 474a048ae4a4fae86e7fde93745f0ea79c7ed717 (patch) | |
| tree | 63e87b93634d90c8236b09a02c19e37031d55304 /config/locales | |
| parent | 7d40d2ed8bd686b32ff9bc620936a72044a610bc (diff) | |
| parent | 9531e27d6414ca1e3c9a81b1a98f0550d74fad1d (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
app/models/match.rb
Diffstat (limited to 'config/locales')
0 files changed, 0 insertions, 0 deletions