diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
commit | a2190ac74dd4d7080b12bab90e552d7aa81209ef (patch) | |
tree | 8b31f38de9882d18df54cf8d9e0de74167a094eb /vendor/wikimedia/composer-merge-plugin/LICENSE | |
parent | 15e69f7b20b6596b9148030acce5b59993b95a45 (diff) | |
parent | 257401d8b2cf661adf36c84b0e3fd1cf85e33c22 (diff) |
Merge branch 'mw-1.26'
Diffstat (limited to 'vendor/wikimedia/composer-merge-plugin/LICENSE')
-rw-r--r-- | vendor/wikimedia/composer-merge-plugin/LICENSE | 2 |
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 |