66ac3be81f
Conflicts: app/views/home/ordergroup.html.haml app/views/login/new_password.html.haml app/views/shared/_auto_complete_users.rhtml app/views/shared/memberships/_current_members.rhtml app/views/shared/memberships/_non_members.rhtml |
||
---|---|---|
.. | ||
environments | ||
initializers | ||
locales | ||
app_config.yml.SAMPLE | ||
application.rb | ||
boot.rb | ||
database.yml.MySQL_SAMPLE | ||
database.yml.SQLite_SAMPLE | ||
deploy.rb.SAMPLE | ||
environment.rb | ||
i18n-js.yml | ||
navigation.rb | ||
routes.rb | ||
schedule.rb |