Fix merge

Victor Costa
1 parent ba70edb6
Showing 1 changed file with 1 additions and 0 deletions Show diff stats
lib/noosfero/api/entities.rb
@@ -163,6 +163,7 @@ module Noosfero
         expose :followers_count
         expose :votes_count
         expose :comments_count
+        expose :archived, :documentation => {:type => "Boolean", :desc => "Defines if a article is readonly"}
       end
  
       class Article < ArticleBase
...	...	@@ -163,6 +163,7 @@ module Noosfero
163	163	expose :followers_count
164	164	expose :votes_count
165	165	expose :comments_count
	166	+ expose :archived, :documentation => {:type => "Boolean", :desc => "Defines if a article is readonly"}
166	167	end
167	168
168	169	class Article < ArticleBase
...	...