github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-18 05:51:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into split_applications

Browse Source 
Conflicts:
	modoboa/extensions/postfix_relay_domains/factories.py
	modoboa/extensions/stats/graphics.py
	modoboa/extensions/stats/management/commands/logparser.py
	modoboa/extensions/webmail/templates/webmail/compose.html
	modoboa/extensions/webmail/validators.py
This commit is contained in:
Antoine Nguyen
2015-04-10 16:37:43 +02:00
parent cc4d60e479 d5f2652a5f
commit 6e884974d5
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
COPYING → LICENSE
View File
MANIFEST.in
+1 -1
View File
@@ -1,4 +1,4 @@
include README.rst COPYING requirements.txt
include README.rst LICENSE requirements.txt
recursive-include modoboa *.html *.js *.css *.png *.po *.mo *.json *.gif *.ttf *.woff
recursive-include modoboa/core/templates *.tpl
recursive-include modoboa/core/commands/templates *.tpl