fix merge conflicts

2016-03-09 20:24:31 +01:00
parent 0f973170d2 b51028ab1d
commit 8f85d99a0a
40 changed files with 1800 additions and 23 deletions
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,6 @@
+-0.0.52
+	- card flag
+	- inventory item
 -0.0.51
 	- fix storno @transfers -> delete from carts on storno
 -0.0.50