diff options
| -rw-r--r-- | LICENSE | 16 | ||||
| -rw-r--r-- | addon/LICENSE | 5 |
2 files changed, 9 insertions, 12 deletions
@@ -25,12 +25,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Friendika incorporates other software which may be licensed under different -terms and conditions. Some system libraries which are supplied with Friendika -are provided under the LGPL and may result in legal encumberance if you make -any code changes to these libraries. +terms and conditions. Some system libraries which are supplied with and +incorporated into Friendika were provided by their respective authors under +the LGPL (Lesser GNU Public License) and may result in legal encumberance if +you make any code changes to these libraries. Addon or "plugin" modules (within the 'addon' directory) are licensed under -terms provided by the respective software author or authors, and MAY include -copyleft licenses such as GPLv3, AGPL, and/or commercial licenses. For the -purposes of licensing, addon modules are considered separate standalone works. -
\ No newline at end of file +terms provided by the respective software author or authors of those works, +and MAY include copyleft licenses such as GPLv3, AGPL, and/or commercial +licenses. For the purposes of licensing, addon modules are considered separate +standalone works. + diff --git a/addon/LICENSE b/addon/LICENSE index 7dd931e30..2e6e056e8 100644 --- a/addon/LICENSE +++ b/addon/LICENSE @@ -10,8 +10,3 @@ plugin. Addons/plugins may be licensed under copyleft or other license terms. Although these projects may require Friendika to operate, no addon or plugin may mandate any changes to the Friendika project license. - -If no license terms are set on an addon/plugin project, the Friendika BSD -project license will apply to the work, but with the project author as the -license owner and copyright holder. - |