Commit graph

4 commits

Author SHA1 Message Date
nek0 c8a3359dd0 inventory backup 2015-04-11 19:44:13 +02:00
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
Astro f332a1a93d missing message 2015-04-10 01:34:45 +02:00
Astro 067663d90c en.msg 2015-04-10 01:30:25 +02:00