]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 3 Mar 2012 00:05:41 +0000 (19:05 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 3 Mar 2012 00:05:41 +0000 (19:05 -0500)
commit705b4a00ce7d127d80da87f96aca3210476978c0
treee4c68c144bf5a7753c403d28db22e6b896269651
parentd32edf83d3fb3bb4bebdc9d24001eff000c2a660
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

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

* master: