Skip to content
Snippets Groups Projects
Commit bca545e6 authored by Andreas Gohr's avatar Andreas Gohr
Browse files

Merge branch 'master' of git://github.com/Aorimn/dokuwiki into pull-request-76 

* 'master' of git://github.com/Aorimn/dokuwiki:
  Change default groupwildcards option to 0 not to change behavior of
  Added support for the %GROUP% wildcard.

Conflicts:
	inc/auth.php
parents 5d0aaf95 8f50749b
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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