Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

Browse Source

* remotes/upstream/master:
  fix @mention autocomplete in comments
  template proc: fix variables regexp

* master:

...

This commit is contained in:

Simon L'nu

2012-03-02 19:05:41 -05:00

parent d32edf83d3

commit 705b4a00ce

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available