lib/plugins/acl/admin.php · 0644090a80cabe51bcee580999ed33913aa24699 · BRIC / dokuwiki

12 years ago

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

Andreas Gohr authored 12 years ago

* '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

bca545e6

History

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

Andreas Gohr authored 12 years ago

* '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

Code owners

Assign users and groups as approvers for specific file changes. Learn more.