You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@allura.apache.org by tv...@apache.org on 2013/03/22 14:58:29 UTC

[5/5] git commit: Merge branch 'db/5995'

Merge branch 'db/5995'


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/0de02f8d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/0de02f8d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/0de02f8d

Branch: refs/heads/master
Commit: 0de02f8d612772acd378797ec6965a71397d36be
Parents: 631319b ecba367
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Fri Mar 22 13:57:02 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Fri Mar 22 13:57:02 2013 +0000

----------------------------------------------------------------------
 Allura/allura/lib/macro.py          |   22 +++++++++++++++++-----
 Allura/allura/lib/plugin.py         |    4 +---
 Allura/allura/model/neighborhood.py |    4 +++-
 Allura/allura/model/notification.py |    1 -
 4 files changed, 21 insertions(+), 10 deletions(-)
----------------------------------------------------------------------