c
c
gitignored
c
gitignored
c
ignor
c
c
c
Merge branch 'dev'

Conflicts:
	.gitignore
	GhentApp/assets/www/.idea/misc.xml
	GhentApp/assets/www/.idea/modules.xml
	GhentApp/assets/www/.idea/workspace.xml
aptk
Merge branch 'staging'

Conflicts:
	GhentApp/assets/www/.idea/workspace.xml
	GhentApp/bin/Ghentapp.apk
	GhentApp/bin/resources.ap_
apk
working
Merge branch 'staging'

Conflicts:
	GhentApp/assets/www/.idea/workspace.xml
cc
page details ophalen