etherpad-lite/.gitignore

node_modules
settings.json
APIKEY.txt
bin/abiword.exe
bin/node.exe
etherpad-lite-win.zip
var/dirty.db
bin/convertSettings.json
*~
*.patch
src/static/js/jquery.js
npm-debug.log
*.DS_Store
Create a template of the settings file 2011-06-02 13:15:02 +02:00			`node_modules`
use a downloaded jQuery instead of using googles CDN, and fixed btw a bug that let pad.js fails randomly 2011-06-30 19:06:07 +02:00			`settings.json`
Installed API infrastructure, getText works already 2011-08-03 20:31:25 +02:00			`APIKEY.txt`
added a buildForWindows script 2011-08-11 23:00:52 +02:00			`bin/abiword.exe`
			`bin/node.exe`
			`etherpad-lite-win.zip`
fixed merge conflicts 2011-08-13 23:18:42 +02:00			`var/dirty.db`
Added backup and patch files to .gitignore. Makes life a bit easier 2011-11-28 20:28:06 +01:00			`bin/convertSettings.json`
			`*~`
fixes automatic update 2012-02-04 18:46:43 +01:00			`*.patch`
Better startup & symlinking 2012-02-26 13:31:47 +01:00			`src/static/js/jquery.js`
			`npm-debug.log`
Merge branch 'pita' Resolved conflicts: .gitignore src/static/js/ace.js src/static/js/ace2_inner.js src/static/js/broadcast.js src/static/js/domline.js src/static/pad.html src/static/timeslider.html Ignored conflicts (please merge manually later): node/server.js src/node/utils/Minify.js 2012-03-02 22:00:20 +01:00			`*.DS_Store`