diff options
author | Andrey Andreev <narf@devilix.net> | 2018-01-09 10:32:02 +0100 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2018-01-09 10:38:30 +0100 |
commit | cce6bd170f24cf0f10ca0b58150d0324433a66be (patch) | |
tree | 367772ab6ca66dc40abb3cb8e9ac7733ba18f401 /license.txt | |
parent | 97e50f72d5920c13d15a0178f5065b06d6e53903 (diff) |
[ci skip] Merge pull request #5376 from jim-parry/copyright-update
Annual copyright update
Conflicts resolved:
system/libraries/Cache/drivers/Cache_apcu.php
Diffstat (limited to 'license.txt')
-rw-r--r-- | license.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/license.txt b/license.txt index 934e126ff..dcac58588 100644 --- a/license.txt +++ b/license.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014 - 2017, British Columbia Institute of Technology +Copyright (c) 2014 - 2018, British Columbia Institute of Technology Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal |