Commit
6005549eafab6c4be93ce43fc0e5351acded0d3a
Exists in
staging
and in
26 other branches
angular_poc, api-article-archived, api-homepage, api_visitor, article-readonly, caching-rails4, captcha_serpro_plugin, comment_paragraph_api, comments_api_reply, content-manager-hostspot, environment-api, export-comment-paragraph, fix_event_date_issue, fix_multitenancy, fix_profile_wall, fix_string_downcase_and_upcase, fix_upload_files_on_development_environment, json_cookie_serializer, login-captcha, master, new_security, new_video_plugin, pg_search_rank, production, resend_confirmation_email, tasks_keep_filter_params
Merge branch 'master' into rails3
|
...
|
...
|
@@ -61,7 +61,7 @@ GEM |
|
61
|
61
|
database_cleaner (1.2.0) |
|
62
|
62
|
diff-lcs (1.1.3) |
|
63
|
63
|
erubis (2.7.0) |
|
64
|
|
- eventmachine (0.12.11) |
|
|
64
|
+ eventmachine (0.12.10) |
|
65
|
65
|
fast_gettext (0.6.8) |
|
66
|
66
|
ffi (1.0.11) |
|
67
|
67
|
gherkin (2.4.21) |
...
|
...
|
|
