Commit
6005549eafab6c4be93ce43fc0e5351acded0d3a
Exists in
master
and in
22 other branches
angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis
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) |
...
|
...
|
|
