diff options
| author | Xavier Ordoquy | 2014-02-18 11:42:35 +0100 |
|---|---|---|
| committer | Xavier Ordoquy | 2014-02-18 11:42:35 +0100 |
| commit | b2f0f4fcf49d457aefc21960f62fcb8f2cf6770d (patch) | |
| tree | 9adabfaa8c2a73e9b1304f8d699a3f70f284634a /docs/topics | |
| parent | 5ae94547bc08ade94c3f1df2223c0b8261cae59f (diff) | |
| parent | 822eb39599b248c68573c3095639a831ab6df99a (diff) | |
| download | django-rest-framework-b2f0f4fcf49d457aefc21960f62fcb8f2cf6770d.tar.bz2 | |
Merge remote-tracking branch 'reference/master' into feature/django_1_7
Diffstat (limited to 'docs/topics')
| -rw-r--r-- | docs/topics/contributing.md | 2 | ||||
| -rw-r--r-- | docs/topics/credits.md | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index 30d292f8..5a5d1a80 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -60,7 +60,7 @@ To run the tests, clone the repository, and then: # Setup the virtual environment virtualenv env - env/bin/activate + source env/bin/activate pip install -r requirements.txt pip install -r optionals.txt diff --git a/docs/topics/credits.md b/docs/topics/credits.md index d4c00bc4..5f0dc752 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -182,6 +182,7 @@ The following people have helped make REST framework great. * Ian Foote - [ian-foote] * Chuck Harmston - [chuckharmston] * Philip Forget - [philipforget] +* Artem Mezhenin - [amezhenin] Many thanks to everyone who's contributed to the project. @@ -400,3 +401,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [ian-foote]: https://github.com/ian-foote [chuckharmston]: https://github.com/chuckharmston [philipforget]: https://github.com/philipforget +[amezhenin]: https://github.com/amezhenin |