Merge branch 'station_logbooks' of https://github.com/magicbug/Cloudlog into station_logbooks

application/migrations/082_add_reset_pass_to_users.php

@@ -15,7 +15,7 @@ class Migration_add_reset_pass_to_users extends CI_Migration {
         {
                 $fields = array(
                         'reset_password_code varchar(50) DEFAULT NULL',
-                        'reset_password_date varchar(50) DEFAULT NULL',
+                        'reset_password_date TIMESTAMP NULL DEFAULT NULL',
                 );
 
                 $this->dbforge->add_column('users', $fields);
@@ -26,4 +26,4 @@ class Migration_add_reset_pass_to_users extends CI_Migration {
                 $this->dbforge->drop_column('users', 'reset_password_code');
                 $this->dbforge->drop_column('users', 'reset_password_date');
         }
-}
+}