Browse code Updated To Latest Source and Resolved conflicts master
commit 3bc67199e83d8956dbfcbafdc0d16eea8d099f80 2 parents f89d7ec + a1cdfa4 Bhavesh Goyal authored on 14 Apr 2015

Showing 15 changed files

• dev-requirements.txt
• setup.py
• src/postorius/models.py
• src/postorius/templates/postorius/base.html
• src/postorius/templates/postorius/lists/memberoptions.html
• src/postorius/templates/postorius/lists/summary.html
• src/postorius/templates/postorius/login.html
• src/postorius/templates/postorius/menu/list_nav.html
• src/postorius/templates/postorius/user_address_activation_sent.html
• src/postorius/tests/mailman_api_tests/test_list_members.py
• src/postorius/urls.py
• src/postorius/views/list.py
• src/postorius/views/views.py
• testing/test_settings.py
• tox.ini

Ignore Space Show notes View dev-requirements.txt

Ignore Space Show notes View setup.py

Ignore Space Show notes View src/postorius/models.py

Ignore Space Show notes View src/postorius/templates/postorius/base.html

Ignore Space Show notes View src/postorius/templates/postorius/lists/memberoptions.html

Ignore Space Show notes View src/postorius/templates/postorius/lists/summary.html

Ignore Space Show notes View src/postorius/templates/postorius/login.html

Ignore Space Show notes View src/postorius/templates/postorius/menu/list_nav.html

Ignore Space Show notes View src/postorius/templates/postorius/user_address_activation_sent.html

Ignore Space Show notes View src/postorius/tests/mailman_api_tests/test_list_members.py

Ignore Space Show notes View src/postorius/urls.py

Ignore Space Show notes View src/postorius/views/list.py

Show notes View src/postorius/views/views.py 100644 → 0

Ignore Space Show notes View testing/test_settings.py

Ignore Space Show notes View tox.ini

Show line notes below