summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2012-10-31 11:14:38 -0700
committerjessib <jessib@riseup.net>2012-10-31 11:14:38 -0700
commitfa6c453603d2754644f80efc6e8a0f6e792cc9bd (patch)
tree4ec755dc917fea9eba4c94d988a0aae25eca6790 /Gemfile.lock
parenta2a8caf577415ef51c0f99da43f9b47bde226fc6 (diff)
parentfc625a54eb5c54cecb5331811ff482df12b7c059 (diff)
Merge branch 'develop' into feature-admin_users
Conflicts: users/app/controllers/application_controller.rb users/app/models/user.rb
Diffstat (limited to 'Gemfile.lock')
0 files changed, 0 insertions, 0 deletions