From: Brion Vibber <brion@pobox.com>
Date: Wed, 16 Mar 2011 18:12:29 +0000 (-0700)
Subject: Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d1c778b4396b778c2124852cc9856f169109e551;hp=6ec11ed781ee7ac6816557cddf8c5e1383bce691;p=quix0rs-gnu-social.git

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
---

diff --git a/lib/framework.php b/lib/framework.php
index 350a1c268d..da96c8e1d4 100644
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -33,6 +33,7 @@ define('AVATAR_MINI_SIZE', 24);
 
 define('NOTICES_PER_PAGE', 20);
 define('PROFILES_PER_PAGE', 20);
+define('MESSAGES_PER_PAGE', 20);
 
 define('FOREIGN_NOTICE_SEND', 1);
 define('FOREIGN_NOTICE_RECV', 2);