Merge branch 'master' into new-gui

Conflicts:
	Gemfile.lock
This commit is contained in:
Reinier Balt 2014-01-07 21:01:55 +01:00
parent fa537fbeb0
commit eb1502d4e0
28 changed files with 385 additions and 221 deletions

View file

@ -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
%>