diff options
author | 2012-08-27 13:31:54 -0400 | |
---|---|---|
committer | 2012-08-27 13:31:54 -0400 | |
commit | b12db9ef9214d801280310222fc5e9d16f8af3de (patch) | |
tree | 161aea0e484d014ddc1d1c8430037829debdbb5d /Setup.hs | |
parent | 347d3892e7b7897f696268a162e8638b12612f31 (diff) | |
parent | d228e4ca8c5b9ed88fe6b30ada12e822f847f58d (diff) |
Merge branch 'master' into assistant
Conflicts:
debian/changelog
Updated changelog for assistant and webapp
Diffstat (limited to 'Setup.hs')
0 files changed, 0 insertions, 0 deletions