diff options
author | Fabio Comuni <fabrix.xm@gmail.com> | 2012-02-29 14:58:37 +0100 |
---|---|---|
committer | Fabio Comuni <fabrix.xm@gmail.com> | 2012-02-29 14:58:37 +0100 |
commit | b71a3af4570ccf349804b9ffa151fc1d35287d88 (patch) | |
tree | 264c012a0c8ca28c4035666d35c547a829968a2a /LICENSE | |
parent | f5b8654818e63a0583e58caecc8a13c2d83c12d5 (diff) | |
parent | fb33b4f2bcd18e63d311e6dba3aaa2ea5efdec3b (diff) | |
download | volse-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-x | LICENSE | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |