Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-25 00:53:48 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into add_acl

Browse Source 
in order to merge add_acl into master

Conflicts:
	Controller/ReportController.php
	Entity/Report.php
This commit is contained in:
Julien Fastré
2015-06-30 09:55:35 +02:00
parent a16a097550 ee205d3386
commit baa9262962
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Entity/Report.php
View File

@@ -1,6 +1,5 @@
<?php
/*
*
* Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>