abafbc6ef5
Conflicts: db/schema.rb |
||
---|---|---|
.. | ||
menu | ||
_counters.html.erb | ||
_flashes.html.haml | ||
_notifies.html.haml | ||
application.html.haml | ||
invite.html.haml | ||
sessions.html.haml | ||
tour.html.haml | ||
with_sidebar.html.haml |