Skip to content
Snippets Groups Projects
Commit b94072c6 authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

Merge remote-tracking branch 'refs/remotes/afi/dev#13769_cache_doc_availability' into afi-master

Conflicts:
	cosmogramme/tests/php/classes/NoticeIntegrationTest.php
	library/Class/Codification.php
	library/ZendAfi/View/Helper/Admin/TagSelectionChamps.php
	tests/library/Class/CodificationTest.php
parents 83cc72ec a77686bd
Branches
Tags
3 merge requests!628Master,!600Master,!593Master
Showing
with 336 additions and 171 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment