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
6,210 Commits 268 Branches 107 Tags
5abb0665eebc8e55f11a60363fbc36d4b3d0115c
Commit Graph

4 Commits

Author SHA1 Message Date
Romain Neutron
9b471fdf76 Fix CS 2013-10-31 11:53:30 +01:00
Romain Neutron
f955163edb Merge branch '3.7' into 3.8 
Conflicts:
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/conf.d/_GV_template.inc
 2013-09-14 02:02:56 +02:00
Romain Neutron
d2bc4f4a23 Add AuthenticationServiceProvider 2013-05-29 14:22:50 +02:00
Romain Neutron
0247c20634 Merge API root, API v1 and API oauth2 application in a single one 2013-05-24 15:37:02 +02:00