Merge branch 'staging' of gitlab.com:participa/noosfero into staging

Leandro Santos
2 parents 98c2d5a5 8a35817a
Showing 2 changed files with 1 additions and 12 deletions Show diff stats
plugins/juventude
test/fixtures/article_followers.yml
-Subproject commit 82f8f051425a046bb144f831dcb1a947334d972d
+Subproject commit 1aa48652e63b9fc1a29002ede8df2a1906b2d7bc
@@ -1,11 +0,0 @@
-# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
-
-one:
-  person_id: 1
-  article_id: 1
-  since: 2015-06-16 17:02:01
-
-two:
-  person_id: 1
-  article_id: 1
-  since: 2015-06-16 17:02:01
	@@ -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