Browse Source

Merge branch 'master' of https://git.web.rug.nl/VRE/Broker

continuous-integration/drone/push Build is passing

Details

# Conflicts:
#	VRE/VRE/settings.py

master

Elwin Buisman 6 months ago

parent

eaa70d9ed3 7e09b5f918

commit

cdb4ec43ab

Whitespace

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

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available