mirror of
https://github.com/TracksApp/tracks.git
synced 2026-01-08 18:28:50 +01:00
Merge branch 'master' into new-gui
Conflicts: Gemfile.lock
This commit is contained in:
parent
fa537fbeb0
commit
eb1502d4e0
28 changed files with 385 additions and 221 deletions
2
test/fixtures/recurring_todos.yml
vendored
2
test/fixtures/recurring_todos.yml
vendored
|
|
@ -20,7 +20,7 @@ def two_weeks_hence
|
|||
end
|
||||
|
||||
def way_back
|
||||
Time.zone.local(2008,1,1)
|
||||
Time.zone.local(2008,1,1).to_s(:db)
|
||||
end
|
||||
|
||||
%>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue