aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-04-16 20:16:44 -0700
committerfriendica <info@friendica.com>2013-04-16 20:16:44 -0700
commitf72d3512242d13fbba69b77a739319a9cd58627c (patch)
treed59c8904fda78b04ee19e42343d8c7ca56c67a5f /LICENSE
parent3e7e0a3c43ddb742a6518a3b38b89e3d9675eae5 (diff)
parent23f897b8aedac8a99aa81ac7799ec67ca196d407 (diff)
downloadvolse-hubzilla-f72d3512242d13fbba69b77a739319a9cd58627c.tar.gz
volse-hubzilla-f72d3512242d13fbba69b77a739319a9cd58627c.tar.bz2
volse-hubzilla-f72d3512242d13fbba69b77a739319a9cd58627c.zip
Merge branch 'master' into photothread
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE2
1 files changed, 1 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index 01f1c19d5..b8c943177 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2013 the Friendica Project
+Copyright (c) 2010-2013 the Red Project
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy