Baptiste Grob 6c6520eb71 Merge branch '004' into crypto-refactor ...

# Conflicts:
#	package.json

2020-06-09 16:52:01 +02:00

..

config

Updates gems

2020-01-31 11:55:30 -06:00

fonts

Grunt -> Webpack, Haml -> Pug

2019-12-16 16:26:51 -06:00

javascripts

Merge branch '004' into crypto-refactor

2020-06-09 16:52:01 +02:00

stylesheets

Remove conflict resolution modal

2020-04-12 18:07:14 -05:00

templates/directives

fix: select first note on sign in

2020-04-21 12:30:43 -05:00