diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-03 23:52:39 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-03 23:52:39 -0500 |
| commit | acb5be88f394b126c3fba48ceb9798403c5afae1 (patch) | |
| tree | d28ba5b07bc91cb92f02c9e490bff5501859e6fd /.gitignore | |
| parent | 9f246b9ec386ccb5e6665408d050cf71fc336283 (diff) | |
| parent | ec9b2d4f40bd6a878aeca3ca32ba2aafe3836da5 (diff) | |
Merge branch 'master' of github.com:LukeShu/leager
Conflicts:
app/controllers/users_controller.rb
app/views/users/index.html.erb
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions