mirror of
https://github.com/TracksApp/tracks.git
synced 2025-12-31 06:18:49 +01:00
Conflicts: Gemfile.lock app/assets/javascripts/application.js app/helpers/todos_helper.rb app/views/shared/_footer.html.erb |
||
|---|---|---|
| .. | ||
| _add_new_action.html.erb | ||
| _add_new_item_form.html.erb | ||
| _flash.html.erb | ||
| _flash.m.erb | ||
| _footer.html.erb | ||
| _footer.m.erb | ||
| _goto.html.erb | ||
| _keyboard_shortcuts.html.erb | ||
| _navbar.html.erb | ||