Skip to content
Snippets Groups Projects
pbarroca's avatar
Patrick Barroca authored
Merge remote-tracking branch 'refs/remotes/afi/dev_#15526_google_var_to_generic_var' into afi-master

Conflicts:
	cosmogramme/php/_init.php
ee0a5cfd
AFI-OPAC 2.0 is released under a dual-license AGPL / Proprietary use.

Copyright (c) 2012, Agence Française Informatique (AFI). All rights reserved.

You can redistribute it and/or modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by the Free Software Foundation (see COPYING)

Third-Party Components and their license are listed in doc/extern_libs.txt