dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:web2py/web2py

Browse Source 
Conflicts:
	VERSION
This commit is contained in:
Massimo
2013-11-07 11:06:37 -06:00
parent 40d5e5dfe9 58c22b8ed0
commit 9178b23473
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+4
View File
@@ -1 +1,5 @@
<<<<<<< HEAD
Version 2.7.4-stable+timestamp.2013.11.07.11.00.04
=======
Version 2.7.4-stable+timestamp.2013.11.06.16.56.35
>>>>>>> 58c22b8ed0c463aed5907d4e7bce025f905d52ed