Merged in dev and updated migration number

application/config/migration.php

@@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE;
 |
 */
 
-$config['migration_version'] = 140;
+$config['migration_version'] = 141;
 
 /*
 |--------------------------------------------------------------------------

application/migrations/140_alter_user_options_table.php

@@ -1,13 +0,0 @@
-<?php
-
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-class Migration_alter_user_options_table extends CI_Migration {
-
-	public function up() {
-		$this->db->query("ALTER TABLE user_options CHANGE COLUMN option_value option_value text DEFAULT NULL;");
-	}
-
-	public function down(){
-	}
-}