Gustavo Cruz 5ab3033871 Merge changes manually due to conflicts with the upstream master branch.

2015-03-23 09:25:22 -04:00

..

bin

I solved the notices in cliMafe and added XSS

2015-03-18 08:55:53 -04:00

classes

Merge changes manually due to conflicts with the upstream master branch.

2015-03-23 09:25:22 -04:00

config

Merge changes manually due to conflicts with the upstream master branch.

2015-03-23 09:25:22 -04:00

content

Updating default translations cache file for PM3.0

2015-03-12 15:59:34 -04:00

controllers

Merge remote-tracking branch 'upstream/master'

2015-03-19 12:51:23 -04:00

data

Merge changes manually due to conflicts with the upstream master branch.

2015-03-23 09:25:22 -04:00

includes

…

js

PM-1787

2015-03-12 09:59:19 -04:00

lib

…

menus

…

methods

Merge changes manually due to conflicts with the upstream master branch.

2015-03-23 09:25:22 -04:00

plugins

…

skinEngine

…

src

Merge changes manually due to conflicts with the upstream master branch.

2015-03-23 09:25:22 -04:00

templates

Merge changes manually due to conflicts with the upstream master branch.

2015-03-23 09:25:22 -04:00

test

…

xmlform

PM-1809 DESIGNER > Classic Designer > Web Entry: El contenedor de la creacióel 'Web Entry' con 'Single HTML' deja espacios innecesarios en los extremos inferior y derecha

2015-03-13 17:27:52 -04:00

gulliver-win.bat

…

PmBootstrap.php

…