Commits

Luke Plant committed fa5c510 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/$', 'django.views.generic.simple.redirect_to', {'url': u'/wiki/Index'}),
     (r'^wiki/', include('djiki.urls')),
 
 )
 #                github or bitbucket under the account 'spookylukey'.  Currently
 #                includes:
 #                 - diff_match_patch from google
-#                 - django-autocomplete
-#                 - django-mailer
 #
 #                These can be symlinks
 #
 xlrd==0.7.1
 creole>=1.2
 -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