Merge remote-tracking branch 'origin/release'
Conflicts: cms/envs/common.py lms/envs/common.py
Showing
common/djangoapps/embargo/__init__.py
0 → 100644
common/djangoapps/embargo/admin.py
0 → 100644
common/djangoapps/embargo/forms.py
0 → 100644
common/djangoapps/embargo/middleware.py
0 → 100644
common/djangoapps/embargo/models.py
0 → 100644
common/static/data/geoip/GeoIP.dat
0 → 100644
File added
common/static/data/geoip/README
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
lms/templates/static_templates/embargo.html
0 → 100644
Please
register
or
sign in
to comment