From: Roland Haeder <roland@mxchange.org>
Date: Sun, 8 Mar 2015 19:51:53 +0000 (+0100)
Subject: Merge branch 'nightly' of gitorious.org:social/mainline into nightly
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fd220b1cf8d9846c99f8ee7014dd147737f62b8a;p=quix0rs-gnu-social.git

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Conflicts:
	actions/replies.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
---

fd220b1cf8d9846c99f8ee7014dd147737f62b8a
diff --cc actions/replies.php
index 11d9c7c706,49098d0950..5bf2f8edc4
--- a/actions/replies.php
+++ b/actions/replies.php
@@@ -93,23 -74,6 +74,26 @@@ class RepliesAction extends ManagedActi
              // TRANS: Client error when page not found (404)
              $this->clientError(_('No such page.'), 404);
          }
++<<<<<<< HEAD
 +
 +        return true;
 +    }
 +
 +    /**
 +     * Handle a request
 +     *
 +     * Just show the page. All args already handled.
 +     *
 +     * @param array $args $_REQUEST data
 +     *
 +     * @return void
 +     */
 +    function handle(array $args=array())
 +    {
 +        parent::handle($args);
 +        $this->showPage();
++=======
++>>>>>>> 1442ca16b410d327d7ec6269944144dfa075ff17
      }
  
      /**
@@@ -229,7 -183,7 +203,11 @@@
          $this->elementEnd('div');
      }
  
++<<<<<<< HEAD
 +    function isReadOnly(array $args=array())
++=======
+     public function isReadOnly($args)
++>>>>>>> 1442ca16b410d327d7ec6269944144dfa075ff17
      {
          return true;
      }