aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-08 16:03:30 -0800
committerfriendica <info@friendica.com>2015-01-08 16:03:30 -0800
commitfab09ef1bc7ebd74055f62350e7012dec09c817b (patch)
tree51ea03d8bf877a8eee3ccdeaf8c9ac441d2a3f09 /LICENSE
parent0657195125675700eeb9bcd1bc92f4299cac0304 (diff)
parent836223bf5b60a8b0db27dac9e5c183c77fa6a2e1 (diff)
downloadvolse-hubzilla-fab09ef1bc7ebd74055f62350e7012dec09c817b.tar.gz
volse-hubzilla-fab09ef1bc7ebd74055f62350e7012dec09c817b.tar.bz2
volse-hubzilla-fab09ef1bc7ebd74055f62350e7012dec09c817b.zip
Merge branch 'master' into trinidad
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE2
1 files changed, 1 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index f85b21913..7656d552e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2014 RedMatrix
+Copyright (c) 2010-2015 RedMatrix
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy