jennylee c2adddd9fc Merge remote branch 'upstream/master'

2012-10-22 15:58:12 -04:00

..

bin

BUG 4940 "Add option to set a time limit on 'self serve'..." SOLVED

2012-10-22 13:55:35 -04:00

classes

Merge remote branch 'upstream/master'

2012-10-22 15:58:12 -04:00

config

BUG 4940 "Add option to set a time limit on 'self serve'..." SOLVED

2012-10-22 13:55:35 -04:00

content

…

controllers

CODE STYLE controllers/adminProxy.php

2012-10-19 11:31:42 -04:00

data

…

includes

…

js

BUG 4940 "Add option to set a time limit on 'self serve'..." SOLVED

2012-10-22 13:55:35 -04:00

lib

…

menus

…

methods

Merge pull request #851 from ralpheav/master

2012-10-22 10:26:03 -07:00

plugins

…

services/rest

…

skinEngine

…

templates

…

test

…

xmlform

BUG 4940 "Add option to set a time limit on 'self serve'..." SOLVED

2012-10-22 13:55:35 -04:00

gulliver-win.bat

…

PmBootstrap.php

…