diff options
| author | Azul <azul@leap.se> | 2013-01-18 07:44:57 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2013-01-18 07:44:57 +0100 |
| commit | 27730c7e665ed64e691fdf6dbeebc39c8bfbbc4b (patch) | |
| tree | cd1df0a9a7d3f0a9812b512cfb93db0f79b0421f /config.ru | |
| parent | 247a6f14db14543773beb1a1e96f2c335800eb82 (diff) | |
| parent | 19d563e2e2db98ecc5143229f554df6a09bc457e (diff) | |
Merge remote-tracking branch 'origin/master' into feature/fixed-email-address
Conflicts:
users/app/views/emails/_email.html.haml
Diffstat (limited to 'config.ru')
0 files changed, 0 insertions, 0 deletions