search

hagsteel / swampdragon

swampdragon
Other
556 stars 73 forks source link

Changes for Django 1.9 #181

Closed viaregio closed 8 years ago

acwio commented 8 years ago

@jonashagstedt Can you please accept this pull request?

hagsteel commented 8 years ago

If you resolve the merge conflicts I will.

acwio commented 8 years ago

@viaregio Did some searching. My best guess is that you didn't resolve the merge conflicts from your old pull request into master before submitting the new pull request here: https://github.com/viaregio/swampdragon/pull/1.

viaregio commented 8 years ago

OK, it seems the conflict is resolved.

acwio commented 8 years ago

@viaregio :+1: Thanks so much! @jonashagstedt Thanks for accepting!