Merge branch 'master' into polls

This commit is contained in:
Juanjo Bazán
2017-01-02 12:14:40 +01:00
14 changed files with 31 additions and 19 deletions

View File

@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20161227140109) do
ActiveRecord::Schema.define(version: 20161229110336) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -378,7 +378,6 @@ ActiveRecord::Schema.define(version: 20161227140109) do
t.string "responsible_name", limit: 60
t.text "summary"
t.string "video_url"
t.integer "physical_votes", default: 0
t.tsvector "tsv"
t.integer "geozone_id"
t.datetime "retired_at"