]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bcadd87 a3dcf49)
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)
* 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:


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.