[Pywps-dev] github updates

[Jan Rudolf]

Hi Jachym,

dblog.py: I don't know, if it's a good idea merging my version of
dblog.py because I've switched to ORM, there are no explicit SQL
queries. The ORM is dependant of pywps/server/app/__init__.py. I will
try to rebase, hope, there aren't going to be any complications.

Jan 


On 2016-07-06 13:35, Jachym Cepicky wrote:
> Hi GSoC students Vikas and Jan,
> 
> I've merged two pull requests - you might try git rebase your branches
> to current master, to avoid future conflicts
> 
> Jan: I assume, dblog.py will be a big mess, since I did some changes
> there too. Will probably move to your version of the file completely
> (I did just some input sanitation)
> 
> J