aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2012-02-29 14:58:37 +0100
committerFabio Comuni <fabrix.xm@gmail.com>2012-02-29 14:58:37 +0100
commitb71a3af4570ccf349804b9ffa151fc1d35287d88 (patch)
tree264c012a0c8ca28c4035666d35c547a829968a2a /LICENSE
parentf5b8654818e63a0583e58caecc8a13c2d83c12d5 (diff)
parentfb33b4f2bcd18e63d311e6dba3aaa2ea5efdec3b (diff)
downloadvolse-hubzilla-b71a3af4570ccf349804b9ffa151fc1d35287d88.tar.gz
volse-hubzilla-b71a3af4570ccf349804b9ffa151fc1d35287d88.tar.bz2
volse-hubzilla-b71a3af4570ccf349804b9ffa151fc1d35287d88.zip
Merge remote-tracking branch 'friendica/master' into randomerror
Diffstat (limited to 'LICENSE')
-rwxr-xr-xLICENSE2
1 files changed, 1 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index 65ec68b9c..15c3e825b 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2010, 2011 the Friendica Project
+Copyright (c) 2010-2012 the Friendica Project
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy