Merge branch 'permission_scheme' of gitorious.org:mediagoblin/npigeons-mediagoblin into permission_scheme

Browse Source

Conflicts:
	mediagoblin.ini
	mediagoblin/auth/tools.py
	mediagoblin/config_spec.ini

...

This commit is contained in:

tilly-Q 2014-05-01 14:28:11 -04:00

parent ce26346a4c 0a5981fd54

commit 79a97f6bc3

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available