summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2016-11-08 15:57:46 +0800
committerGitHub <noreply@github.com>2016-11-08 15:57:46 +0800
commit8857d701fb21ce1c0379d597c36e93103bc97487 (patch)
treeec15d24f51ffa757a6b94730baa1d531b8f7b87b
parente06e0f9bb97034813d3d5a8391f1aab1877885ec (diff)
parent4e4c0c2cd3da66d83779c540ec7b879e64c8db3d (diff)
downloadgitea-8857d701fb21ce1c0379d597c36e93103bc97487.tar.gz
gitea-8857d701fb21ce1c0379d597c36e93103bc97487.zip
Merge pull request #115 from strk/license
Re-add "Gogs authors" copyright (togheter with "Gitea authors")
-rw-r--r--LICENSE3
1 files changed, 2 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index 05da0c70b8..a8d4b49dd0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,5 @@
-Copyright (c) The Gitea Authors
+Copyright (c) 2016 The Gitea Authors
+Copyright (c) 2015 The Gogs Authors
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal