]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 2 Mar 2012 15:55:59 +0000 (10:55 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 2 Mar 2012 15:55:59 +0000 (10:55 -0500)
commit725daf2a5d31175764dc5110d2fa3e6bc60917bc
tree1260f003b2351627ef0fa8fe0c1cb6f8ef630bdf
parentbcadd873eea086255152708c4d1cede4d3dcc581
parenta3dcf491f14d6c044e3bd10844f5c737b21feae2
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  template proc: allow isolation of var name between [ and ]
  group: fix create new group form
  templates: fix tags
  template proc: remove unused function and commented out code
  template proc: first optimization

* master: