kikito 8596df1ea8 merges master and fix conflicts

2015-09-10 18:09:19 +02:00

..

assets

adds Turbolinks progress bar

2015-09-10 13:35:01 +02:00

controllers

Makes welcome screen work using a sessions controller

2015-09-10 17:41:37 +02:00

helpers

adds cache key for commendable without updated_at

2015-09-09 14:45:19 +02:00

mailers

adds email verification

2015-08-27 23:57:04 +02:00

models

merges master and fix conflicts

2015-09-10 18:09:19 +02:00

views

merges master and fix conflicts

2015-09-10 18:09:19 +02:00