Luke Plant avatar Luke Plant committed 80bd507 Merge

Merged from default

Comments (0)

Files changed (3)

     (r'^admin/', include(admin.site.urls)),
     (r'^officers/', include('cciw.officers.urls')),
     url('^autocomplete/(\w+)/$', autocomplete, name='autocomplete'),
-    (r'^wiki/$', RedirectView.as_view(url=u'/wiki/Index')),
     (r'^wiki/', include('djiki.urls')),
     (r'^paypal/ipn/', include('paypal.standard.ipn.urls')),
 )
 #                github or bitbucket under the account 'spookylukey'.  Currently
 #                includes:
 #                 - diff_match_patch from google
-#                 - django-autocomplete
-#                 - django-mailer
 #
 #                These can be symlinks
 #
 python-dateutil==2.0
 -e git+https://github.com/dcramer/django-paypal#egg=paypal
 -e hg+https://bitbucket.org/spookylukey/django/@00f11ed96fe8#egg=django
+-e git://github.com/jtauber/django-mailer.git@840d25bb9d#egg=django-mailer
+-e hg+https://bitbucket.org/spookylukey/django-autocomplete/@28490de155fb#egg=django-autocomplete
+-e git://github.com/spookylukey/djiki.git@fa8031ee46#egg=djiki
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.