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 /src/templates/admin/settings.html | |
| 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 'src/templates/admin/settings.html')
| -rw-r--r-- | src/templates/admin/settings.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/templates/admin/settings.html b/src/templates/admin/settings.html index 560ac507..74f35521 100644 --- a/src/templates/admin/settings.html +++ b/src/templates/admin/settings.html @@ -50,5 +50,6 @@ </div> </div> + <div style="display:none"><a href="/javascript" data-jslicense="1">JavaScript license information</a></div> </body> </html> |