Merge branch 'master' into notes-search
authorENT8R <info.ent8r@gmail.com>
Tue, 9 Oct 2018 09:41:22 +0000 (11:41 +0200)
committerENT8R <info.ent8r@gmail.com>
Tue, 9 Oct 2018 09:41:22 +0000 (11:41 +0200)
commit083500f056f5b995f1979f88b37793046d9e4d37
treecc474b9bd488efafd5ed349083da8fe73e19fccd
parente8cb7ac8f16987788fb65889b14a7e1446a46da3
parent1c59d4a776c6dacb472889a3c68b374697b4cb4b
Merge branch 'master' into notes-search
app/controllers/notes_controller.rb