Commit graph

5 commits

Author SHA1 Message Date
nek0
8a525a1088 Merge branch 'i18n' of https://github.com/astro/yammat into astro-i18n
Conflicts:
	Handler/CashCheck.hs
	Handler/NewUser.hs
	templates/journal.hamlet
	templates/modify.hamlet
2015-04-10 18:46:59 +02:00
nek0
0242b31e22 cashiers should know, when they were created 2015-04-10 18:19:48 +02:00
nek0
3e6701b12e resolved cashCheck issue 2015-04-10 14:50:44 +02:00
Astro
0077e0b98a i18n support 2015-04-10 01:30:25 +02:00
nek0
d4609d1cbe forgot files 2015-04-09 17:45:52 +02:00