# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: steve@tachikoman-20080526032253-1g1v8fwn7uwydxf4 # target_branch: https://code.launchpad.net/~meow-developers/meow\ # /trunk # testament_sha1: 77d6c71c37414656c6b01a285a9917ffc292bd24 # timestamp: 2008-05-25 23:25:22 -0400 # base_revision_id: eric@themoritzfamily.com-20080524054422-\ # exxqryk5wx5llcju # # Begin patch === modified file 'settings.py' --- settings.py 2008-05-24 05:44:22 +0000 +++ settings.py 2008-05-25 01:44:00 +0000 @@ -15,15 +15,20 @@ """Django Settings""" import os +import sys +import logging + SITE_ID = 0 SITE_DOMAIN = "http://meow.appspot.com/" DEBUG = os.environ.get('USER', '') != 'apphosting' -MESSAGE_COUNT = 50 +MESSAGE_COUNT = 25 PUBLIC_MESSAGE_COUNT = 50 FEED_MESSAGE_COUNT = 10 +MESSAGE_QUERY_LIMIT = 1000 + ROOT_URLCONF = 'urls' TIME_ZONE = "UTC" MIDDLEWARE_CLASSES = ( === modified file 'templates/base.html' --- templates/base.html 2008-05-21 18:17:32 +0000 +++ templates/base.html 2008-05-26 01:50:15 +0000 @@ -17,12 +17,16 @@