Merge branch 'release/1.2' into develop

ktekinay · Jan 13, 2015 · 2d2d53f · 2d2d53f
2 parents 532f269 + 31f6ae6
commit 2d2d53f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Kaju Admin App/Kaju Admin.xojo_project b/Kaju Admin App/Kaju Admin.xojo_project
@@ -26,13 +26,13 @@ Class=FolderItemAlias;Other Classes/FolderItemAlias.xojo_code;&h53EF1AE5;&h6AF5D
 Class=HTTPSSocket;../Kaju Classes/Kaju/HTTPSSocket.xojo_code;&h5ACDFAEB;&h11400316;false
 AppMenuBar=MainMenuBar
 MajorVersion=1
-MinorVersion=1
+MinorVersion=2
 SubVersion=0
 NonRelease=0
 Release=3
 InfoVersion=Kaju Admin
-LongVersion=v.1.1
-ShortVersion=1.1
+LongVersion=v.1.2
+ShortVersion=1.2
 WinCompanyName=MacTechnologies Consulting
 WinInternalName=
 WinProductName=

diff --git a/README.md b/README.md
@@ -333,7 +333,7 @@ Add a translation for each, then submit a pull request as outlined above.
 - Changed behavior of how the "A never version of..." message is presented in the Update window.
 - German translation.
 
-1.2
+1.2 (Jan. 12, 2015)
 
 - Added timeout timer for downloads.
 - Fixed transparency issue on Windows.