mirror of
https://github.com/TracksApp/tracks.git
synced 2026-01-08 18:28:50 +01:00
Conflicts: Gemfile.lock app/assets/javascripts/application.js app/helpers/todos_helper.rb app/views/shared/_footer.html.erb |
||
|---|---|---|
| .. | ||
| application.html.erb | ||
| application.old.html.erb | ||
| login.html.erb | ||
| login.old.html.erb | ||
| mobile.m.erb | ||