Commit
6005549eafab6c4be93ce43fc0e5351acded0d3a
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 'master' into rails3
|
| @@ -61,7 +61,7 @@ GEM |
| @@ -61,7 +61,7 @@ GEM |
|
61
| database_cleaner (1.2.0) |
61
| database_cleaner (1.2.0) |
|
62
| diff-lcs (1.1.3) |
62
| diff-lcs (1.1.3) |
|
63
| erubis (2.7.0) |
63
| erubis (2.7.0) |
|
64
| - eventmachine (0.12.11) |
64
| + eventmachine (0.12.10) |
|
65
| fast_gettext (0.6.8) |
65
| fast_gettext (0.6.8) |
|
66
| ffi (1.0.11) |
66
| ffi (1.0.11) |
|
67
| gherkin (2.4.21) |
67
| gherkin (2.4.21) |
