Nikolay Lopin 2811843e70 Merge branch 'master' into new-snippet-tabbar ...

# Conflicts:
#	browser/main/Detail/SnippetNoteDetail.js

2018-03-18 21:26:12 +03:00

..

components

Merge branch 'master' into new-snippet-tabbar

2018-03-18 21:26:12 +03:00

finder

Merge branch 'master' into feat/display-url-title

2018-02-05 11:50:14 +02:00

lib

Merge remote-tracking branch 'upstream/master' into add-unit-tests-for-lib-markdown

2018-03-17 18:54:18 +11:00

main

Merge branch 'master' into new-snippet-tabbar

2018-03-18 21:26:12 +03:00

styles

Fixes UI overlapping in the snippet editor (bottom options)

2018-02-25 07:41:50 -08:00