aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2011-01-03 09:45:13 +0100
committerfabrixxm <fabrix.xm@gmail.com>2011-01-03 09:45:13 +0100
commit43283fd35fb9987a1554612220f11a0875697bd4 (patch)
tree2e9db966f98a1187c6be74998ebd2905fe0a8c39 /LICENSE
parentdcaf4003eca3fe4f958760587eefea52b171fab3 (diff)
parentd92659560b8edd0594b587103b43ad5bd5012639 (diff)
downloadvolse-hubzilla-43283fd35fb9987a1554612220f11a0875697bd4.tar.gz
volse-hubzilla-43283fd35fb9987a1554612220f11a0875697bd4.tar.bz2
volse-hubzilla-43283fd35fb9987a1554612220f11a0875697bd4.zip
Merge branch 'friendika-master'
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE2
1 files changed, 1 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index 01fe880bd..fd3ca3b61 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
* Friendika
-* Copyright (c) 2010, Mike Macgirvin
+* Copyright (c) 2010, 2011 Mike Macgirvin
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without