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 /src/static/favicon.ico | |
| 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 'src/static/favicon.ico')
| -rw-r--r-- | src/static/favicon.ico | bin | 1150 -> 1150 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/src/static/favicon.ico b/src/static/favicon.ico Binary files differindex 2529c923..df7b6289 100644 --- a/src/static/favicon.ico +++ b/src/static/favicon.ico |