summaryrefslogtreecommitdiff
path: root/users/app
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-11-09 15:13:54 +0100
committerAzul <azul@leap.se>2012-11-09 15:13:54 +0100
commitf9501552b7df41487e523c2a2fb3a102707ecae9 (patch)
tree4368cae72e7d9f209f340fffdbaf6860dce7eed7 /users/app
parentda2804c8f8a800851fa1863f579e2b8e9a57b4cc (diff)
parentca2e1b9f379ccba068ad0ebb852d855f1639cd3a (diff)
Merge branch 'develop' into feature-warden-srp
Conflicts: users/app/assets/javascripts/srp
Diffstat (limited to 'users/app')
m---------users/app/assets/javascripts/srp0
1 files changed, 0 insertions, 0 deletions
diff --git a/users/app/assets/javascripts/srp b/users/app/assets/javascripts/srp
-Subproject 3bf101bc1ef3b5a58fe2f1e2a2e7a681f6de6c0
+Subproject efac662cdf31bc4b61ffb97b8c398e22a86c364