summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-11-02 21:31:18 -0400
committerChris McDonough <chrism@plope.com>2012-11-02 21:31:18 -0400
commitf156e1fdffb95cef721848a5a20cd7ec02157f0f (patch)
tree03668eaa29ee42f188077c4aed94b646006b8a22 /.gitmodules
parent2c3e04fda933f5faf3f365b22cda8accf79841de (diff)
parent926fb68c194bb65b7fec059015260b418d4ca83d (diff)
downloadpyramid-f156e1fdffb95cef721848a5a20cd7ec02157f0f.tar.gz
pyramid-f156e1fdffb95cef721848a5a20cd7ec02157f0f.tar.bz2
pyramid-f156e1fdffb95cef721848a5a20cd7ec02157f0f.zip
Merge branch '1.4-branch'
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions