aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-03-09 11:41:23 +0100
committerMichael Vogel <icarus@dabo.de>2012-03-09 11:41:23 +0100
commit11c29e0cba4f521c5f37d963109c4807af8bccae (patch)
tree3dde72ce8528cfa9cc6111098585623b5971b605 /LICENSE
parent52ea842e872cc004fd012496c828e9fb6186bec9 (diff)
parent2ce78253aeda8672e12f18f0963f52cd4a35e546 (diff)
downloadvolse-hubzilla-11c29e0cba4f521c5f37d963109c4807af8bccae.tar.gz
volse-hubzilla-11c29e0cba4f521c5f37d963109c4807af8bccae.tar.bz2
volse-hubzilla-11c29e0cba4f521c5f37d963109c4807af8bccae.zip
Merge commit '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