Merge remote-tracking branch 'abeudin/master'

Conflicts: MANIFEST.in prosopopee/prosopopee.py setup.py
2016-02-23 06:07:43 +01:00 · 2016-02-23 06:07:43 +01:00 · b659233858
commit b659233858
parent b415f627c2 d6ca3b41c0
1 changed files with 1 additions and 1 deletions
--- a/MANIFEST.in
+++ b/MANIFEST.in
@ -1,2 +1,2 @@
-recursive-include prosopopee/themes *
+recursive-include themes *
 include requirements.txt
`@ -1,2 +1,2 @@`
	`recursive-include prosopopee/themes *`	`recursive-include themes *`
	`include requirements.txt`	`include requirements.txt`