summaryrefslogtreecommitdiffstats
path: root/.tx/config
diff options
context:
space:
mode:
authorAdolfo Fitoria <adolfo.fitoria@gmail.com>2011-10-06 10:21:47 -0300
committerAdolfo Fitoria <adolfo.fitoria@gmail.com>2011-10-06 10:21:47 -0300
commitea711798daa68d54bc3ae27e3a0540c64011fbf2 (patch)
tree53ab891fcf6656ea12142d875d5bf2dc4c9f404d /.tx/config
parenta7d0b40a537375137214ed99979ad4c84ebe5675 (diff)
parent115e4b6316c7821f03abf14211551ea0269ea2aa (diff)
downloadaskbot-ea711798daa68d54bc3ae27e3a0540c64011fbf2.tar.gz
askbot-ea711798daa68d54bc3ae27e3a0540c64011fbf2.tar.bz2
askbot-ea711798daa68d54bc3ae27e3a0540c64011fbf2.zip
Merge branch 'master' into new-template
Conflicts: askbot/skins/default/media/style/style.css
Diffstat (limited to '.tx/config')
0 files changed, 0 insertions, 0 deletions