diff options
author | elijah <elijah@riseup.net> | 2016-01-10 13:48:03 -0800 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2016-01-10 13:48:03 -0800 |
commit | be1f937ac57c4acaeda5c1377e7023b2d5766dd8 (patch) | |
tree | 7a5e60bbddfc77d11408db23ed1bb1e0bcf14457 /app/assets/stylesheets/leap.scss | |
parent | ba98c75ca83b6236bc4c953396638ea8b6d2ece2 (diff) | |
parent | 7c4122110f9c8b538a1268fdab4fe486816800ed (diff) |
Merge branch 'remove_couponcode' of https://github.com/Alster-Hamburgers/leap_web into remove_couponcode
# Conflicts:
# lib/tasks/invite_code.rake
Diffstat (limited to 'app/assets/stylesheets/leap.scss')
0 files changed, 0 insertions, 0 deletions