conflicts · 7345f3ca1f - dbois - Gitea: Git with a cup of tea

conflicts

This commit is contained in:

theo

2019-10-25 16:52:12 +02:00

parent d0069061ba

commit 7345f3ca1f

3 changed files with 26 additions and 12 deletions

									
										application/controllers/reports/ReservationsController.php
									
		+1
		-1
	
												View File
												
				@@ -60,4 +60,4 @@ class ReservationsController extends MY_Controller {

				        $this->json( $projects );

				    }

				}

				}