Update license badge and license description (#77)

* Update license badge and license description
* Use GPL instead of GPL v3 for badge
This commit is contained in:
Yuji Yaginuma 2018-12-06 19:20:14 +09:00 committed by Michael Mayer
parent 59b70ea75b
commit bde3219f20
2 changed files with 12 additions and 7 deletions

View file

@ -1,7 +1,7 @@
PhotoPrism: Browse your life in pictures PhotoPrism: Browse your life in pictures
======================================== ========================================
[![Apache License](https://img.shields.io/badge/license-apache-blue.svg)][license] [![License: GPL](https://img.shields.io/badge/License-GPL-blue.svg)][license]
[![Code Quality](https://goreportcard.com/badge/github.com/photoprism/photoprism)][goreport] [![Code Quality](https://goreportcard.com/badge/github.com/photoprism/photoprism)][goreport]
[![Test Coverage](https://codecov.io/gh/photoprism/photoprism/branch/develop/graph/badge.svg)][coverage] [![Test Coverage](https://codecov.io/gh/photoprism/photoprism/branch/develop/graph/badge.svg)][coverage]
[![Build Status](https://travis-ci.org/photoprism/photoprism.png?branch=develop)][ci] [![Build Status](https://travis-ci.org/photoprism/photoprism.png?branch=develop)][ci]

View file

@ -12,13 +12,18 @@ https://github.com/photoprism/photoprism/issues
Copyright © 2018 The PhotoPrism contributors. Copyright © 2018 The PhotoPrism contributors.
Licensed under the Apache License, Version 2.0 (the "License"); you may not use This program is free software: you can redistribute it and/or modify
this application except in compliance with the License. it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Unless required by applicable law or agreed to in writing, software distributed This program is distributed in the hope that it will be useful,
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR but WITHOUT ANY WARRANTY; without even the implied warranty of
CONDITIONS OF ANY KIND, either express or implied. See the License for the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
specific language governing permissions and limitations under the License. GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package main package main