From: zuber Date: Tue, 20 Oct 2009 16:08:21 +0000 (+0200) Subject: Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/96bc5f73483f3e907eebd60df638a9de0a9124f3?ds=sidebyside;hp=--cc Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma Conflicts: apps/api/handlers/library_handlers.py --- 96bc5f73483f3e907eebd60df638a9de0a9124f3 diff --cc apps/api/handlers/library_handlers.py index 9751fefb,aef1e9c1..c84cab8f --- a/apps/api/handlers/library_handlers.py +++ b/apps/api/handlers/library_handlers.py @@@ -9,9 -9,7 +9,8 @@@ __date__ = "$2009-09-25 15:49:50$ __doc__ = "Module documentation." from piston.handler import BaseHandler, AnonymousBaseHandler +from django.http import HttpResponse - import re from datetime import date from django.core.urlresolvers import reverse