Skip to content
Snippets Groups Projects
Commit 8b8e2697 authored by lbrun's avatar lbrun
Browse files

Merge branch 'master' into...

Merge branch 'master' into dev#27763_sitotheque_avoir_une_option_pour_desindexer_un_site_comme_pour_les_articles

Conflicts:
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_272.php
parents d1c287fd 9b86de60
Branches
Tags
3 merge requests!1267Master,!1221Master,!1217Dev#27763 sitotheque avoir une option pour desindexer un site comme pour les articles
Showing
with 322 additions and 138 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