Merge branch 'master' of localhost:xiaoxiao/gogs3

Conflicts: .gitignore LICENSE
11 years ago · fcbe7ef5c1
parent 5bfad6867d c61fa28f49
commit fcbe7ef5c1
2 changed files with 2 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -32,4 +32,4 @@ _cgo_export.*

 _testmain.go

-*.exe
+*.exe
--- a/2
+++ b/2
@ -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.