Home Explore Help
Register Sign In
Apq
/
gogs
mirror of https://github.com/gogs/gogs.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge branch 'master' of localhost:xiaoxiao/gogs3

Conflicts:
	.gitignore
	LICENSE
Lunny Xiao 11 years ago
parent
5bfad6867d c61fa28f49
commit
fcbe7ef5c1
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      .gitignore
  2. 1 1
      LICENSE

+ 1 - 1
.gitignore
View File 

@@ -32,4 +32,4 @@ _cgo_export.*
 
 
 _testmain.go
 
 
-*.exe
 
+*.exe

+ 1 - 1
LICENSE
View File 

@@ -24,4 +24,4 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 
 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.