m
errors fixed
Merge branch 'master' of https://github.com/holdera/HealthApp
more files
f
Merge branch 'master' of https://github.com/holdera/HealthApp

Conflicts:
	Symfony/app/cache/dev/appDevUrlGenerator.php.meta
	Symfony/app/cache/dev/profiler/index.csv
	Symfony/app/logs/dev.log
Revert "Merge branch 'master' of https://github.com/holdera/HealthApp"

This reverts commit 7d695254a1c45b089fdfff1f26302761d5a4caa6, reversing
changes made to 68445c63eac88a09b0f45f8fdac6d92ff4776138.
Revert "Revert "Merge branch 'master' of https://github.com/holdera/HealthApp""

This reverts commit 2c89e80d8c69dc2c883dfd8b03e1aaa76f7446ae.
errors fixed
k i hate symfony i didn't change anything
didn't change...hate symfony
waste
Merge branch 'master' of https://github.com/holdera/HealthApp

Conflicts:
	Symfony/app/cache/dev/appDevDebugProjectContainerCompiler.log
	Symfony/app/cache/dev/classes.map
	Symfony/app/cache/dev/classes.php.meta
	Symfony/app/cache/dev/profiler/index.csv
	Symfony/app/config/security.yml
	Symfony/app/logs/dev.log