aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorMichael <icarus@dabo.de>2012-03-02 10:34:18 +0100
committerMichael <icarus@dabo.de>2012-03-02 10:34:18 +0100
commit20817b4b8ea8b7d074d57a3fd752862931cf711c (patch)
treefd0344bd209043c4d8191ef68dceb1499cf7dd9a /LICENSE
parent52ea842e872cc004fd012496c828e9fb6186bec9 (diff)
parentf1bf6dcdfb89bf3c21e498ba3d76c600dafed934 (diff)
downloadvolse-hubzilla-20817b4b8ea8b7d074d57a3fd752862931cf711c.tar.gz
volse-hubzilla-20817b4b8ea8b7d074d57a3fd752862931cf711c.tar.bz2
volse-hubzilla-20817b4b8ea8b7d074d57a3fd752862931cf711c.zip
Merge remote branch 'upstream/master'
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