You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
This repo is archived. You can view files and clone it, but cannot push or open issues/pull-requests.
Igor Scheller d0074cf006 Merge remote-tracking branch 'engelsystem/feature-igel-rewrite'
# Conflicts:
#	includes/controller/angeltypes_controller.php
#	includes/pages/admin_groups.php
#	includes/pages/user_settings.php
#	includes/sys_page.php
#	src/Exceptions/Handler.php
#	src/Http/Request.php
8 years ago
..
angeltypes_controller.php #336: Integration of symfony/http-foundation request 8 years ago
event_config_controller.php handle failed db queries in Db class 8 years ago
rooms_controller.php Merge remote-tracking branch 'engelsystem/feature-igel-rewrite' 8 years ago
shift_entries_controller.php Merge remote-tracking branch 'engelsystem/feature-igel-rewrite' 8 years ago
shifts_controller.php Merge remote-tracking branch 'engelsystem/feature-igel-rewrite' 8 years ago
shifttypes_controller.php Merge remote-tracking branch 'engelsystem/feature-igel-rewrite' 8 years ago
user_angeltypes_controller.php Merge remote-tracking branch 'engelsystem/feature-igel-rewrite' 8 years ago
user_driver_licenses_controller.php #337: Added routing 8 years ago
users_controller.php Merge remote-tracking branch 'engelsystem/feature-igel-rewrite' 8 years ago