fix merge conflicts

2016-01-16 19:11:01 +01:00
parent c27ca44a5b a782232ad8
commit 272d2d4f8a
11 changed files with 65 additions and 31 deletions
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,8 +1,12 @@
-0.0.21
+-0.0.22
 	- fix product barcode unique on admin site
 	- When checking ticket, use status = Active
 	- force cassa open, if trying to enter prodcut/ticket sell page
 	- force select default account
+-0.0.21
+	- account state fix account on reception
+	- reception user - tickets > delete ticket
+	- show current account
 -0.0.20
 	- account state email with pdf
 	- login email