Learn more about cloning repositories
You have read-only access
Merge remote-tracking branch 'origin/master' # Conflicts: # plgng/settings.py # qcg/forms.py # qcg/views.py
