Merged r16734 from trunk to 3.4-stable (#26311).

Update remaining copyrights.

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16735 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/config/settings.yml b/config/settings.yml
index 7520d8e8447da2f1f67e879c8cd190cc27f08fd1..a64697755b660c17aaa2a21903124ddf9bdb7fd9 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2016  Jean-Philippe Lang
+# Copyright (C) 2006-2017  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/test/integration/api_test/files_test.rb b/test/integration/api_test/files_test.rb
index 0b355c42c887dab752e36ff6de414cc1082813b7..b6ecc0139a831d3577ff4aa64cf28e577fb1ce48 100644 (file)
--- a/test/integration/api_test/files_test.rb
+++ b/test/integration/api_test/files_test.rb
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2015  Jean-Philippe Lang
+# Copyright (C) 2006-2017  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License