Skip to content
Snippets Groups Projects
Commit fc756e0d authored by Michael Hamann's avatar Michael Hamann
Browse files

Merge branch 'master' into indexer_improvements

Conflicts:
	inc/fulltext.php
	inc/indexer.php
	lib/exe/indexer.php
parents 8605afb1 820923f1
No related branches found
No related tags found
No related merge requests found
Showing
with 138 additions and 25 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment