Merge branch 'master' of https://github.com/ulrichknecht/baroness

2016-02-15 21:38:17 +01:00
parent 19da96a05c 06df4d8daa
commit 7d921cbf2b
10 changed files with 1 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .idea/*
 *.pyc
--- a/app/init.pyc
+++ b/app/init.pyc
--- a/app/check_rights.pyc
+++ b/app/check_rights.pyc
--- a/app/consumption.pyc
+++ b/app/consumption.pyc
--- a/app/database.pyc
+++ b/app/database.pyc
--- a/app/gui.pyc
+++ b/app/gui.pyc
--- a/app/product.pyc
+++ b/app/product.pyc
--- a/app/user.pyc
+++ b/app/user.pyc
--- a/app/users.pyc
+++ b/app/users.pyc
--- a/app/views.pyc
+++ b/app/views.pyc