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

Merge branch 'master' into elastic-indexer

Browse Source 
Conflicts:
	bin/console
This commit is contained in:
Mathieu Darse
2014-10-15 12:18:44 +02:00
parent e88a219cb6 85102bfce7
commit 5b24664001
70 changed files with 2573 additions and 2251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/vagrant/config/bower/.bowerrc
View File

@@ -1,4 +1,4 @@
{
"directory" : "tmp-assets",
"directory": "www/assets",
"interactive": false
}