aboutsummaryrefslogtreecommitdiffhomepage
path: root/LICENSE
diff options
context:
space:
mode:
authorChris Lawrence2015-10-02 20:47:19 -0400
committerChris Lawrence2015-10-02 20:47:19 -0400
commit69104e8e04c14ac91d396a41e0c05351ec2a96bf (patch)
treeb95b95b20746a2a4d93fec64c4c4b10e6be85123 /LICENSE
parent54082a8d76e8c12bb5b424f7ff21644632f054aa (diff)
parent01c55d4cf6ff60772be8a86320c4a5bcd7719a05 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE2
1 files changed, 1 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index 3866d13..0962307 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2014 Hakim El Hattab, http://hakim.se
+Copyright (C) 2015 Hakim El Hattab, http://hakim.se
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal