diff options
| author | Egil Moeller <egil.moller@freecode.no> | 2012-03-02 22:00:20 +0100 |
|---|---|---|
| committer | Egil Moeller <egil.moller@freecode.no> | 2012-03-02 22:00:20 +0100 |
| commit | ce5d2d86850be0496467a16333c0646d71649f7c (patch) | |
| tree | 56e4eed0c777c6f338b1dfaef4a1daabdd1ccce4 /.gitignore | |
| parent | 6cd391d3fb33f5c59fd0d1deaaa18c1034e0bd81 (diff) | |
| parent | 6fd73ecfda27fd6639c30a4c05c6149d66f669ee (diff) | |
| download | etherpad-lite-ce5d2d86850be0496467a16333c0646d71649f7c.zip | |
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
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -13,3 +13,4 @@ bin/convertSettings.json src/static/js/jquery.js src/static/js/prefixfree.js npm-debug.log +*.DS_Store |