mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-03 13:49:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fixed merge conflicts

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-08-13 22:18:42 +01:00
commit b300dc1d2c
12 changed files with 231 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -2,3 +2,7 @@ node_modules
settings.json
static/js/jquery.min.js
APIKEY.txt
bin/abiword.exe
bin/node.exe
etherpad-lite-win.zip
var/dirty.db