]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge pull request #550 from kalvn/master
authorArthur <arthur@hoa.ro>
Tue, 3 May 2016 17:23:15 +0000 (19:23 +0200)
committerArthur <arthur@hoa.ro>
Tue, 3 May 2016 17:23:15 +0000 (19:23 +0200)
Renames Awesomeplete dollar variable to avoid conflicts with jQuery


Trivial merge