Merge pull request #482 from support-project/release/v1.6.0.pre2

Release v1.6.0.pre2
support-project · Oct 5, 2016 · 9e31b18 · 9e31b18
2 parents 9be7797 + 93201fb
commit 9e31b18
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -168,5 +168,8 @@
    - License: [MIT] https://https://opensource.org/licenses/mit-license.php
    - project-url: http://st3ph.github.io/jquery.easyWizard/
 
+- MathJax
+   - License: [Apache License, Version 2.0] https://github.com/mathjax/MathJax/blob/master/LICENSE
+   - project-url: https://www.mathjax.org/
 
 
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
@@ -58,7 +58,7 @@ message.allready.started=Allready started.
 message.confirm.delete=Are you sure you want to delete?
 
 # Common Label
-label.version=v1.6.0 - pre1
+label.version=v1.6.0 - pre2
 label.login=Sign in
 label.previous = Previous
 label.next=Next

diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
@@ -58,7 +58,7 @@ message.allready.started=すでに開始済です
 message.confirm.delete=本当に削除しますか?
 
 # Common Label
-label.version=v1.6.0 - pre1
+label.version=v1.6.0 - pre2
 label.login=サインイン
 label.previous = 前へ
 label.next = 次へ

diff --git a/src/main/webapp/WEB-INF/views/open/license/index.jsp b/src/main/webapp/WEB-INF/views/open/license/index.jsp
@@ -206,8 +206,9 @@ $(document).ready(function(){
    - License: [MIT] https://https://opensource.org/licenses/mit-license.php
    - project-url: http://st3ph.github.io/jquery.easyWizard/
 
-
-
+- MathJax
+   - License: [Apache License, Version 2.0] https://github.com/mathjax/MathJax/blob/master/LICENSE
+   - project-url: https://www.mathjax.org/