serv/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-12-29 05:53:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request 'Fix license.' (#190) from q-b/conduit-fork:license into master

Browse source 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/190
Reviewed-by: Timo Kösters <timo@koesters.xyz>
This commit is contained in:
Timo Kösters 2020-08-17 14:13:19 +02:00
commit 6191c3bd00
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitea/PULL_REQUEST_TEMPLATE.md
View file

@ -1 +1 @@
- [ ] I agree to release my code and all other changes of this PR under the AGPL-3.0 license - [ ] I agree to release my code and all other changes of this PR under the AGPL-3.0-only license

2
Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "conduit" name = "conduit"
description = "A Matrix homeserver written in Rust" description = "A Matrix homeserver written in Rust"
license = "AGPL-3.0" license = "AGPL-3.0-only"
authors = ["timokoesters <timo@koesters.xyz>"] authors = ["timokoesters <timo@koesters.xyz>"]
homepage = "https://conduit.rs" homepage = "https://conduit.rs"
repository = "https://git.koesters.xyz/timo/conduit" repository = "https://git.koesters.xyz/timo/conduit"

2
Dockerfile
View file

@ -54,7 +54,7 @@ LABEL org.opencontainers.image.created=${CREATED} \
org.opencontainers.image.revision=${GIT_REF} \ org.opencontainers.image.revision=${GIT_REF} \
org.opencontainers.image.source="https://git.koesters.xyz/timo/conduit.git" \ org.opencontainers.image.source="https://git.koesters.xyz/timo/conduit.git" \
org.opencontainers.image.documentation.="" \ org.opencontainers.image.documentation.="" \
org.opencontainers.image.licenses="AGPL-3.0" \ org.opencontainers.image.licenses="AGPL-3.0-only" \
org.opencontainers.image.ref.name="" \ org.opencontainers.image.ref.name="" \
org.label-schema.docker.build="docker build . -t conduit_homeserver:latest --build-arg CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') --build-arg VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml)" \ org.label-schema.docker.build="docker build . -t conduit_homeserver:latest --build-arg CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') --build-arg VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml)" \
maintainer="Weasy666" maintainer="Weasy666"