Merge branch 'master' of localhost:xiaoxiao/gogs3

Conflicts: .gitignore LICENSE
konstantinbrazhnik · Mar 25, 2014 · fcbe7ef · fcbe7ef
2 parents 5bfad68 + c61fa28
commit fcbe7ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,4 +32,4 @@ _cgo_export.*
 
 _testmain.go
 
-*.exe
+*.exe
diff --git a/LICENSE b/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
 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.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,4 +32,4 @@ _cgo_export.*

		_testmain.go

		*.exe
		*.exe