From 643884a966d5816b482fa9cc178de28696c3f738 Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Mon, 14 Dec 2015 17:23:39 -0300
Subject: [PATCH] Fix merge

---
 lib/noosfero/api/entities.rb | 1 +
 1 file changed, 1 insertion(+), 0 deletions(-)

diff --git a/lib/noosfero/api/entities.rb b/lib/noosfero/api/entities.rb
index 8ae4a52..5a79352 100644
--- a/lib/noosfero/api/entities.rb
+++ b/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
--
libgit2 0.21.2