From: Toshi MARUYAMA Date: Sun, 2 Jul 2017 07:11:56 +0000 (+0000) Subject: Merged r16734 from trunk to 3.4-stable (#26311). X-Git-Tag: 3.4.0~5 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8321fe9a84e5a6848889026e40101c5452530ed0;p=redmine.git 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 7520d8e84..a64697755 100644 --- 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 0b355c42c..b6ecc0139 100644 --- 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