Update version 1823 (#254)

* Bump Merge System version to 1.8.23

* Bump loginconvert plugin version to 1.4.2

* Add .gitattributes

* Update README.md a little

* Update README.md, remove old paragraphs

Author: yuliu

.gitattributes

@@ -0,0 +1,5 @@
+* text=auto eol=lf
+
+.gitattributes export-ignore
+.gitignore export-ignore
+/README.md export-ignore

README.md

@@ -1,7 +1,9 @@
-# Development stop
-As of October 2016 the development of the MyBB Merge System has been stopped in favour of the development of MyBB 2.0. [read more on our blog](https://blog.mybb.com/2016/10/17/mybb-1-8-8-merge-system-1-8-8-release/)
+# Development continues
+
+Please read the blog announcement [MyBB Merge System Support Update](https://blog.mybb.com/2020/01/08/mybb-merge-system-support-update/).
 
 [![MyBB](https://raw.github.com/mybb/mybb/feature/images/logo.png "MyBB")](http://www.mybb.com "MyBB")
+
 ## MyBB Merge System
 A repository for the MyBB merge system.
 

index.php

@@ -36,8 +36,8 @@
  *********** DON'T TOUCH ANYTHING ELSE HERE ***********
  ******************************************************/
 
-$merge_version = "1.8.11";
-$version_code = 1811;
+$merge_version = "1.8.23";
+$version_code = 1823;
 
 // Load core files
 define("MYBB_ROOT", dirname(dirname(__FILE__)).'/');
@@ -1024,4 +1024,3 @@
 
 	$output->module_list();
 }
-

loginconvert.php

@@ -57,7 +57,7 @@ function loginconvert_info()
 		"website"			=> "http://www.mybb.com",
 		"author"			=> "MyBB Group",
 		"authorsite"		=> "http://www.mybb.com",
-		"version"			=> "1.4.1",
+		"version"			=> "1.4.2",
 		"compatibility"		=> "18*",
 		"codename"			=> "loginconvert",
 	);