summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-01-13 00:50:34 +0000
committerGo MAEDA <maeda@farend.jp>2019-01-13 00:50:34 +0000
commita9f10956ec87492826b30bd218b28cef4fbb4e1a (patch)
tree0d9b8f43457a85a6a7d26d4417e0eb92cd3e4698
parent1f0a1f65ca4065a4d946e06f7d532a07e7e7f2a6 (diff)
downloadredmine-a9f10956ec87492826b30bd218b28cef4fbb4e1a.tar.gz
redmine-a9f10956ec87492826b30bd218b28cef4fbb4e1a.zip
Merged r17791 from trunk to 3.4-stable (#30413).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17793 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--.gitignore1
-rw-r--r--.hgignore1
2 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index e19e36c2d..0c34fc623 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
/.loadpath
/.powrc
/.rvmrc
+/.ruby-version
/config/additional_environment.rb
/config/configuration.yml
/config/database.yml
diff --git a/.hgignore b/.hgignore
index e1e895da3..386a21383 100644
--- a/.hgignore
+++ b/.hgignore
@@ -5,6 +5,7 @@ syntax: glob
.loadpath
.powrc
.rvmrc
+.ruby-version
config/additional_environment.rb
config/configuration.yml
config/database.yml