hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 03:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,327 Commits 268 Branches 107 Tags
26bd977d5f3c4564e116c23519164e6bbaae2db4
Commit Graph

3 Commits

Author SHA1 Message Date
Nicolas Le Goff
383ff77449 Merge branch '3.8' 
Conflicts:
	.travis.yml
	lib/Alchemy/Phrasea/Controller/Permalink.php
	lib/classes/API/OAuth2/Adapter.php
	lib/classes/databox.php
 2014-01-27 17:23:03 +01:00
Nicolas Le Goff
12996a2eef Fix merge 3.8 2014-01-20 15:24:28 +01:00
Nicolas Le Goff
c4648e30b1 Add 3.8.3alpha.4 patch 2014-01-14 13:02:23 +01:00