summaryrefslogtreecommitdiff
path: root/users/config/initializers
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-12-13 17:17:30 +0100
committerAzul <azul@leap.se>2012-12-13 17:17:30 +0100
commita77d5cf5fd2ff6cc335b586477d6d6e58f758591 (patch)
tree32640ef2457ecce3a08f704f5b5b0ac00a37f9d8 /users/config/initializers
parent961fe13b784e7f44e55f9cd0a106728c69354a0f (diff)
parent32db6e2ee3ae449f2fe0f947f9ac4aafde340a9d (diff)
Merge branch 'master' into develop
Conflicts: users/test/unit/user_test.rb
Diffstat (limited to 'users/config/initializers')
0 files changed, 0 insertions, 0 deletions