diff options
| author | Helmut Grohne <helmut@subdivi.de> | 2014-07-22 08:56:42 +0200 |
|---|---|---|
| committer | Helmut Grohne <helmut@subdivi.de> | 2014-07-22 08:56:42 +0200 |
| commit | 04597f25729740406775a3dff528c9774c84efd5 (patch) | |
| tree | fe905fc94afbdcfad60d5aaf88886a1f10f92a8c /COPYING | |
| parent | ba9ae116e0bbb25e2df327ba48c82472ccfa2690 (diff) | |
| parent | d48c3c208ee6ba54225b3eb68ce5c9f3c894bfa4 (diff) | |
| download | debian-dedup-04597f25729740406775a3dff528c9774c84efd5.tar.gz | |
Merge branch master into multiarch
Resolve accumulated conflicts. In particular webapp.py gained a few
non-trivial ones, such as changes in InternalRedirect or usage of
contextlib.closing.
Conflicts:
schema.sql
webapp.py
Diffstat (limited to 'COPYING')
| -rw-r--r-- | COPYING | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,10 +1,11 @@ Main author: -Copyright (C) 2013 Helmut Grohne <helmut@subdivi.de> +Copyright (C) 2013-2014 Helmut Grohne <helmut@subdivi.de> -Contributor: +Contributors: Copyright (C) 2013 Jan Lühr (javascript for webapp.py) +Copyright (C) 2014 Guillem Jover <guillem@debian.org> All rights reserved. |