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
ac433a683d error in beverage modification 2015-04-10 17:01:07 +02:00
Astro
0077e0b98a i18n support 2015-04-10 01:30:25 +02:00
nek0
1f3e59e643 now user notification on buy 2015-04-07 22:03:21 +02:00
nek0
f6c15fc356 inital working commit. Almost done. 2015-04-04 06:46:33 +02:00