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

Merge branch 'master' into elastic-indexer

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Damien Alexandre
2014-10-06 18:24:58 +02:00
parent 4d43fe7c2d 2c9bd86d2a
commit 5f7edb5be9
96 changed files with 3436 additions and 3129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/vagrant/config/bower/.bowerrc Normal file
View File

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