diff options
| author | Peter Martischka <pita@pitapoison.de> | 2010-04-08 14:20:23 +0200 |
|---|---|---|
| committer | Peter Martischka <pita@pitapoison.de> | 2010-04-08 14:20:23 +0200 |
| commit | 5ff65ce80e04028fc9ff299534f92e2836c3636a (patch) | |
| tree | bbe0c73d0bffc64adffecb34a9a745819c864539 /.gitignore | |
| parent | 9c1dfc38451a4ee70c99de16bd5799cbe0c69730 (diff) | |
| parent | ef71f285a7263c4df76057baf528e943c8870efb (diff) | |
| download | etherpad-5ff65ce80e04028fc9ff299534f92e2836c3636a.tar.gz etherpad-5ff65ce80e04028fc9ff299534f92e2836c3636a.tar.bz2 etherpad-5ff65ce80e04028fc9ff299534f92e2836c3636a.zip | |
Merge branch 'jefferai' of git://github.com/jefferai/pad
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1,4 +1,5 @@ *~ +etherpad/etc/etherpad.local.properties etherpad/src/etherpad/collab/ace/contentcollector.js etherpad/src/etherpad/collab/ace/domline.js etherpad/src/etherpad/collab/ace/easysync1.js @@ -12,3 +13,4 @@ etherpad/src/static/js/domline_client.js etherpad/src/static/js/easysync2_client.js etherpad/src/static/js/linestylefilter_client.js etherpad/*.log +infrastructure/lib/cos.jar |