aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@diekershoff.homeunix.net>2011-01-01 13:00:50 +0100
committerroot <root@diekershoff.homeunix.net>2011-01-01 13:00:50 +0100
commite024360d44c666072b0b5e7a035cef1e00a043ee (patch)
tree73ac46c125d2f06e6c39b9524bc6e3b3fa9974b5
parent31d447126aefbe1bdb14ed5a4a6b7d84845e9f29 (diff)
parente68f68007cf5dca510a16aad6018659c131149b3 (diff)
downloadvolse-hubzilla-e024360d44c666072b0b5e7a035cef1e00a043ee.tar.gz
volse-hubzilla-e024360d44c666072b0b5e7a035cef1e00a043ee.tar.bz2
volse-hubzilla-e024360d44c666072b0b5e7a035cef1e00a043ee.zip
Merge branch 'master' of git://github.com/friendika/friendika
-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