diff options
| author | rugk <rugk@posteo.de> | 2016-09-30 19:20:40 +0200 |
|---|---|---|
| committer | rugk <rugk@posteo.de> | 2016-09-30 19:20:40 +0200 |
| commit | f29e813ca000e3edfa0231dfc042463d635b075d (patch) | |
| tree | ed31da12002bccea59481012cc22d5e8dc120da6 /.gitignore | |
| parent | b5632b3ac5b8db82d439a6bf29fa93e41712a607 (diff) | |
| parent | f289611ba93a45cd7141f849c7ae896048f9861b (diff) | |
| download | etherpad-lite-f29e813ca000e3edfa0231dfc042463d635b075d.zip | |
Merge https://github.com/ether/etherpad-lite into patch-3
Conflicts:
src/templates/index.html
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions