[Python-modules-commits] [django-webpack-loader] 03/06: merge patched into master

[Michael Fladischer]

This is an automated email from the git hooks/post-receive script.

fladi pushed a commit to branch master
in repository django-webpack-loader.

commit 00e7bfa034640dbe82a9359cbc3a9e36392d2132
Merge: 4da2a6d 947c41b
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Tue Jul 26 08:27:33 2016 +0200

    merge patched into master

 MANIFEST.in                                        |  2 ++
 PKG-INFO                                           | 32 ++++++++++++++++++----
 README.md                                          | 28 +++++++++++++++++--
 debian/.git-dpm                                    |  6 ++--
 ...0001-Don-t-install-LICENSE-as-a-data-file.patch | 21 --------------
 debian/patches/series                              |  1 -
 django_webpack_loader.egg-info/PKG-INFO            | 32 ++++++++++++++++++----
 django_webpack_loader.egg-info/SOURCES.txt         |  1 +
 webpack_loader/__init__.py                         |  2 +-
 webpack_loader/config.py                           |  1 +
 webpack_loader/exceptions.py                       |  4 +++
 webpack_loader/loader.py                           | 23 +++++++++++++---
 webpack_loader/templatetags/webpack_loader.py      | 14 +++++-----
 13 files changed, 117 insertions(+), 50 deletions(-)

diff --cc debian/.git-dpm
index 4e599f2,0000000..f35dd92
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 3f38f3ea4015a25ea82ef075ad6ef9ca9c46b509
- 3f38f3ea4015a25ea82ef075ad6ef9ca9c46b509
- c0f7804ffb03ae6bfc86dcfa7e3475f13e5d472b
++947c41b82283500d4a31d7e63c22dcb0210b3c89
++947c41b82283500d4a31d7e63c22dcb0210b3c89
++947c41b82283500d4a31d7e63c22dcb0210b3c89
 +947c41b82283500d4a31d7e63c22dcb0210b3c89
 +django-webpack-loader_0.3.3.orig.tar.gz
 +1d5c8edc33b4e5cf59f5c274ac0fd490dfcceae8
 +9487
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-webpack-loader.git