summaryrefslogtreecommitdiff
path: root/users/app
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-07-04 04:33:22 -0700
committerelijah <elijah@riseup.net>2013-07-04 04:33:22 -0700
commit6026a1d817fe8bd00389ab7a5016a65a70bb15bf (patch)
treefb975d3bc44270435f7842cffaba4eed98672810 /users/app
parent76b26cc26fdb38a96e49702dc5640c91519803df (diff)
parent26018b4f88d7dc49f3710ac9ccd761791553dfc6 (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/app')
0 files changed, 0 insertions, 0 deletions