Skip to content

Commit

Permalink
Merge f174f26 into f6a4eb3
Browse files Browse the repository at this point in the history
  • Loading branch information
Eric Fischer committed Jul 11, 2016
2 parents f6a4eb3 + f174f26 commit 400ab61
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions analyticsdataserver/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@
)

THIRD_PARTY_APPS = (
'release_util',
'rest_framework',
'rest_framework.authtoken',
'rest_framework_swagger',
Expand Down
1 change: 1 addition & 0 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ djangorestframework==2.4.4 # BSD
django-rest-swagger==0.2.8 # BSD
djangorestframework-csv==1.3.3 # BSD
django-countries==3.2 # MIT
edx-django-release-util==0.0.2 # AGPLv3
elasticsearch-dsl==0.0.11 # Apache 2.0

# markdown is used by swagger for rendering the api docs
Expand Down

0 comments on commit 400ab61

Please sign in to comment.