summaryrefslogtreecommitdiff
path: root/vendor/wikimedia/composer-merge-plugin/LICENSE
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2015-12-17 09:15:42 +0100
committerPierre Schmitz <pierre@archlinux.de>2015-12-17 09:44:51 +0100
commita1789ddde42033f1b05cc4929491214ee6e79383 (patch)
tree63615735c4ddffaaabf2428946bb26f90899f7bf /vendor/wikimedia/composer-merge-plugin/LICENSE
parent9e06a62f265e3a2aaabecc598d4bc617e06fa32d (diff)
Update to MediaWiki 1.26.0
Diffstat (limited to 'vendor/wikimedia/composer-merge-plugin/LICENSE')
-rw-r--r--vendor/wikimedia/composer-merge-plugin/LICENSE2
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/wikimedia/composer-merge-plugin/LICENSE b/vendor/wikimedia/composer-merge-plugin/LICENSE
index 55e376b4..3c9804a6 100644
--- a/vendor/wikimedia/composer-merge-plugin/LICENSE
+++ b/vendor/wikimedia/composer-merge-plugin/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014 Bryan Davis, Wikimedia Foundation, and contributors
+Copyright (c) 2015 Bryan Davis, Wikimedia Foundation, and contributors
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal