Commit
96a2e91e47a91d63586fbe1c02f4eb71eca5c494
Exists in
staging
and in
42 other branches
all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server
Merge branch 'stable'
|
| @@ -9,7 +9,7 @@ |
| @@ -9,7 +9,7 @@ |
|
9
| # |
9
| # |
|
10
| # It's strongly recommended to check this file into your version control system. |
10
| # It's strongly recommended to check this file into your version control system. |
|
11
| |
11
| |
|
12
| -ActiveRecord::Schema.define(:version => 20130304200849) do |
12
| +ActiveRecord::Schema.define(:version => 20130429214630) do |
|
13
| |
13
| |
|
14
| create_table "abuse_reports", :force => true do |t| |
14
| create_table "abuse_reports", :force => true do |t| |
|
15
| t.integer "reporter_id" |
15
| t.integer "reporter_id" |
