diff options
| author | elijah <elijah@riseup.net> | 2013-07-04 04:33:22 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2013-07-04 04:33:22 -0700 |
| commit | 6026a1d817fe8bd00389ab7a5016a65a70bb15bf (patch) | |
| tree | fb975d3bc44270435f7842cffaba4eed98672810 /users | |
| parent | 76b26cc26fdb38a96e49702dc5640c91519803df (diff) | |
| parent | 26018b4f88d7dc49f3710ac9ccd761791553dfc6 (diff) | |
Merge branch 'feature/new-ui' of github.com:elijh/leap_web into feature/new-ui
Conflicts:
app/assets/stylesheets/application.scss
ui_dependencies.rb
users/app/controllers/users_controller.rb
users/app/views/sessions/new.html.haml
users/app/views/users/edit.html.haml
users/app/views/users/new.html.haml
Diffstat (limited to 'users')
0 files changed, 0 insertions, 0 deletions