summaryrefslogtreecommitdiffhomepage
path: root/LICENSE
diff options
context:
space:
mode:
authorChris Lawrence2014-04-13 14:05:51 -0400
committerChris Lawrence2014-04-13 14:05:51 -0400
commitac766444567293dc64ae8779e501c3fe0eb174dd (patch)
treee0f6910f20b51189b93815974bba70a87e39299d /LICENSE
parentd1d6cca272050c2088037e8255fe0ca77017a61b (diff)
parent9da952fea30906090446d038430186b11dba7f13 (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 e1e8bf7..3866d13 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2013 Hakim El Hattab, http://hakim.se
+Copyright (C) 2014 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