diff options
author | Michael <icarus@dabo.de> | 2012-03-02 10:34:18 +0100 |
---|---|---|
committer | Michael <icarus@dabo.de> | 2012-03-02 10:34:18 +0100 |
commit | 20817b4b8ea8b7d074d57a3fd752862931cf711c (patch) | |
tree | fd0344bd209043c4d8191ef68dceb1499cf7dd9a /LICENSE | |
parent | 52ea842e872cc004fd012496c828e9fb6186bec9 (diff) | |
parent | f1bf6dcdfb89bf3c21e498ba3d76c600dafed934 (diff) | |
download | volse-hubzilla-20817b4b8ea8b7d074d57a3fd752862931cf711c.tar.gz volse-hubzilla-20817b4b8ea8b7d074d57a3fd752862931cf711c.tar.bz2 volse-hubzilla-20817b4b8ea8b7d074d57a3fd752862931cf711c.zip |
Merge remote branch 'upstream/master'
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 |