hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix latest merge

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-10-09 21:50:32 +02:00
parent 28eecf6a09
commit 10a83bc6c4
37 changed files with 1178 additions and 1848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -55,7 +55,7 @@ composer.phar
behat.yml
# Exclude vagrant configuration file
.vagrant
/.vagrant
# Exclude crossdomain.xml file it's generated
/www/crossdomain.xml