Revision 97801513 docs/source/require.rst

b/docs/source/require.rst
9 9
DjNRO heavily depends on the following:
10 10

  
11 11
* Python (<3 & >=2.6)
12
<<<<<<< refs/remotes/origin/wheezy
12 13
* Django (1.4) - python-django
14
=======
15
* Django (>=1.4) - python-django
16
>>>>>>> local
13 17
* memcached
14 18
* python-mysqldb (If you wish to use MySQL as the DB backend)
15 19
* mysql-client-5.1
......
22 26
* libapache2-mod-wsgi
23 27
* apache2-shibboleth : The server should be setup as a Shibboleth SP
24 28
* A mail server - Tested with exim
29
* python-oauth2
30
* python-requests
31
* python-lxml
32
* python-yaml
25 33

  
26 34
Django Social Auth
27 35
------------------
......
35 43
* django-social-auth
36 44

  
37 45
 *  OpenId support depends on python-openid
46
<<<<<<< refs/remotes/origin/wheezy
38 47
 
39 48
 *  OAuth support depends on python-oauth2 
49
=======
50

  
51
 *  OAuth support depends on python-oauth2
52

  
53

  
54

  
55

  
56
>>>>>>> local

Also available in: Unified diff