Merge remote-tracking branch 'origin/master' into 0.5.x-dev

danielasplund · Dec 30, 2015 · 9e41ae6 · 9e41ae6
2 parents 85378db + b7d075c
commit 9e41ae6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/docs/migrations.rst b/docs/migrations.rst
@@ -442,7 +442,7 @@ To simply change the name of the primary key, we need to override the default ``
             {
                 $table = $this->table('followers', array('id' => 'user_id'));
                 $table->addColumn('follower_id', 'integer')
-                      ->addColumn('created', 'datetime', array('default' => 'CURRENT_TIMESTAMP'))
+                      ->addColumn('created', 'timestamp', array('default' => 'CURRENT_TIMESTAMP'))
                       ->save();
             }