浏览代码

Merge branch 'master' of localhost:xiaoxiao/gogs3

Conflicts:
	.gitignore
	LICENSE
Lunny Xiao 11 年之前
父节点
当前提交
fcbe7ef5c1
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      .gitignore
  2. 1 1
      LICENSE

+ 1 - 1
.gitignore

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

+ 1 - 1
LICENSE

@@ -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
 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 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
 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.