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

Merge branch '3.8'

Browse Source 
Conflicts:
	.travis.yml
	templates/web/setup/wrapper.html.twig
	tests/Alchemy/Tests/Phrasea/Authentication/AuthenticatorTest.php
This commit is contained in:
Romain Neutron
2013-11-05 15:20:35 +01:00
parent 414f6b60af 68cba5d061
commit f27fa53d4c
19 changed files with 113 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/databox/field.php
View File

@@ -235,6 +235,8 @@ class databox_field implements cache_cacheableInterface
$this->thumbtitle = $row['thumbtitle'];
$this->loadVocabulary();
return $this;
}