Merge pull request #1878 from jumpserver/dev

[Update] 更改版本号

Merge pull request #1878 from jumpserver/dev
[Update] 更改版本号
1341983f · 老广 · GitHub · 9a5d3cb4 · 78936bf9 · 1341983f
Unverified Commit 1341983f authored Oct 08, 2018 by 老广 Committed by GitHub Oct 08, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

__init__.py apps/__init__.py +1 -1

_footer.html apps/templates/_footer.html +1 -1

No files found.
--- a/apps/__init__.py
+++ b/apps/__init__.py
@@ -2,4 +2,4 @@
 # -*- coding: utf-8 -*-
 #

-__version__ = "1.4.1"
+__version__ = "1.4.2"
--- a/apps/templates/_footer.html
+++ b/apps/templates/_footer.html
 {% load i18n %}
 <div class="footer fixed">
    <div class="pull-right">
-        Version <strong>1.4.1-{% include '_build.html' %}</strong> GPLv2.
+        Version <strong>1.4.2-{% include '_build.html' %}</strong> GPLv2.
        <!--<img style="display: none" src="http://www.jumpserver.org/img/evaluate_avatar1.jpg">-->
    </div>
    <div>