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
Files
b96c7e86224106218bafd1380311ebcaf23d3f85
Phraseanet/lib/classes/API/OAuth2/Application
History
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
..
Navigator.php
Merge branch '3.7' into 3.8
2013-09-14 02:02:56 +02:00
OfficePlugin.class.php
Add Office Plugin client id and secret
2013-09-09 13:31:31 +02:00