]> git.immae.eu Git - github/shaarli/Shaarli.git/commit
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)
commit5a63c34f3a68ce2f53ee9164e2a35a0904676399
tree98f622b24e7c453edae6ed5a89836d88be436a8f
parentfa72470d5d14082e6c05b83f3f32439298dbc0e3
parent69a1a90c27953b8a2523f6e49258170cdc6b682d
Merge pull request #550 from kalvn/master

Renames Awesomeplete dollar variable to avoid conflicts with jQuery