Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Fix pasting formatted text
Remove link formatting from python part, use django-like variables in editor.html
Merge remote-tracking branch 'upstream/develop' into develop
Added Dutch translation provided by Vistaus.
Added Dutch translation provided by Vistaus.
Create links on paste on client size
fix #272
Merge pull request #276 from duizendnegen/develop

Dutch translation
Merge branch 'develop' of github.com:nvbn/everpad into develop
Merge branch 'release/2.5.4'
Merge branch 'master' into package/ubuntu
Update changelog
Merge branch 'package/ubuntu' into package/ubuntu-usc