Igor Wiedler 9a075e905d Merge remote-tracking branch 'cyberalien/ticket/10665' into develop ...

* cyberalien/ticket/10665:
  [ticket/10665] Adding includejs to acp templates
  [ticket/10665] Solution for T_SUPER_TEMPLATE_PATH
  [ticket/10665] New test class for templates with tree
  [ticket/10665] Changing template->_js_include to public
  [ticket/10665] Moving filter parameters to one array
  [ticket/10665] INCLUDEJS unit test
  [ticket/10665] Changing template compiler test
  [ticket/10665] INCLUDEJS template changes
  [ticket/10665] INCLUDEJS template tag

2012-04-01 19:52:44 +02:00

..

prosilver

Merge remote-tracking branch 'cyberalien/ticket/10665' into develop

2012-04-01 19:52:44 +02:00

subsilver2

Merge remote-tracking branch 'upstream/develop' into ticket/10665

2012-04-01 19:28:37 +03:00