Commit 067c7384 authored by abuddenberg's avatar abuddenberg
Browse files

Merge branch 'master' of k3:/home/git/repositories/assessment/gcis-py-client

Conflicts:
	.gitignore
parents 6fe14a22 01ea4f39
......@@ -5,7 +5,6 @@
.settings
*.pyc
*.pk1
bin/*
src/blah.py
src/Blah.py
dist/images/*.png
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment