diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 21:30:30 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 21:30:30 -0500 |
| commit | 5f8baf6334f427506193ea8efd1356812468e191 (patch) | |
| tree | 216b749f9d589739eefa69e02122ed60654a2d9b /config/locales | |
| parent | 7bcd854443e368806cf1f4ece562c157db723d1a (diff) | |
| parent | c9f2abad7b9c967e23ed2b2867d426eb27f61387 (diff) | |
Merge branch 'clean'
Conflicts:
app/controllers/tournaments_controller.rb
Diffstat (limited to 'config/locales')
0 files changed, 0 insertions, 0 deletions