summaryrefslogtreecommitdiff
path: root/app/views/home
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2013-01-18 07:44:57 +0100
committerAzul <azul@leap.se>2013-01-18 07:44:57 +0100
commit27730c7e665ed64e691fdf6dbeebc39c8bfbbc4b (patch)
treecd1df0a9a7d3f0a9812b512cfb93db0f79b0421f /app/views/home
parent247a6f14db14543773beb1a1e96f2c335800eb82 (diff)
parent19d563e2e2db98ecc5143229f554df6a09bc457e (diff)
Merge remote-tracking branch 'origin/master' into feature/fixed-email-address
Conflicts: users/app/views/emails/_email.html.haml
Diffstat (limited to 'app/views/home')
0 files changed, 0 insertions, 0 deletions