Merge remote-tracking branch 'sirianni/patch-1'
authorAlexander Barton <alex@barton.de>
Wed, 20 May 2015 10:58:05 +0000 (12:58 +0200)
committerAlexander Barton <alex@barton.de>
Wed, 20 May 2015 10:58:20 +0000 (12:58 +0200)
* sirianni/patch-1:
  Highlight this keyword in javascript

Closes joaoafrmartins/seti-monokai#19.

1  2 
index.less

diff --cc index.less
Simple merge