Download as
Browse Code »

Commit ce019365ff626ce0f5f0cf4aba269d210cbf8d73

Authored by Leandro Santos
2 parents 8d6a97c8 26739884
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'staging' into production

Showing 2 changed files with 1 additions and 12 deletions   Show diff stats
plugins/juventude
  Diff comments   View file @ce01936
1 -Subproject commit 82f8f051425a046bb144f831dcb1a947334d972d 1 +Subproject commit 1aa48652e63b9fc1a29002ede8df2a1906b2d7bc
test/fixtures/article_followers.yml
View file @8d6a97c
@@ -1,11 +0,0 @@ @@ -1,11 +0,0 @@
1 -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html  
2 -  
3 -one:  
4 - person_id: 1  
5 - article_id: 1  
6 - since: 2015-06-16 17:02:01  
7 -  
8 -two:  
9 - person_id: 1  
10 - article_id: 1  
11 - since: 2015-06-16 17:02:01