Commit b7ed294e authored by Liang Ding's avatar Liang Ding

Merge pull request #240 from b3log/master

Rebase
parents 53de0f9c fb7d758e
...@@ -110,9 +110,9 @@ ...@@ -110,9 +110,9 @@
</developer> </developer>
<developer> <developer>
<id>dongxv.vang@gmail.com</id> <id>dongxu.wang@acm.org</id>
<name>Dongxu Wang</name> <name>Dongxu Wang</name>
<email>dongxv.vang@gmail.com</email> <email>dongxu.wang@acm.org</email>
<url>http://dx.b3log.org</url> <url>http://dx.b3log.org</url>
<roles> <roles>
<role>Committer</role> <role>Committer</role>
......
...@@ -30,4 +30,3 @@ mail.smtp.port=587 ...@@ -30,4 +30,3 @@ mail.smtp.port=587
mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
mail.smtp.socketFactory.fallback=false mail.smtp.socketFactory.fallback=false
mail.smtp.socketFactory.port=465 mail.smtp.socketFactory.port=465
mail.debug=false
...@@ -30,4 +30,3 @@ mail.smtp.port=587 ...@@ -30,4 +30,3 @@ mail.smtp.port=587
mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
mail.smtp.socketFactory.fallback=false mail.smtp.socketFactory.fallback=false
mail.smtp.socketFactory.port=465 mail.smtp.socketFactory.port=465
mail.debug=false
...@@ -44,4 +44,4 @@ jdbc.maxConnCnt=10 ...@@ -44,4 +44,4 @@ jdbc.maxConnCnt=10
jdbc.transactionIsolation=READ_COMMITTED jdbc.transactionIsolation=READ_COMMITTED
# The specific table name prefix # The specific table name prefix
jdbc.tablePrefix= jdbc.tablePrefix=b3_solo
...@@ -30,4 +30,3 @@ mail.smtp.port=587 ...@@ -30,4 +30,3 @@ mail.smtp.port=587
mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
mail.smtp.socketFactory.fallback=false mail.smtp.socketFactory.fallback=false
mail.smtp.socketFactory.port=465 mail.smtp.socketFactory.port=465
mail.debug=false
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment