nuxsmin 295ea768eb Merge remote-tracking branch 'origin/master' ...

Conflicts:
	inc/init.php

2015-02-03 13:33:14 +01:00

..

ext

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

locales

* Updated header and PHPdoc syntax

2015-02-02 04:07:04 +01:00

tpl

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

account.class.php

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

acl.class.php

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

auth.class.php

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

backup.class.php

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

category.class.php

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

common.class.php

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

config.class.php

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

crypt.class.php

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

customer.class.php

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

db.class.php

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

dbstructure.sql

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

files.class.php

* Updated header and PHPdoc syntax

2015-02-02 04:07:04 +01:00

groups.class.php

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

html.class.php

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

import.class.php

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

init.php

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

installer.class.php

Merge remote-tracking branch 'origin/master'

2015-02-03 13:33:14 +01:00

keepassimport.class.php

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

keepassximport.class.php

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

ldap.class.php

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

log.class.php

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

migrate.class.php

* Updated header and PHPdoc syntax

2015-02-02 04:07:04 +01:00

profiles.class.php

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

upgrade.class.php

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

users.class.php

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00

util.class.php

Merge branch 'v1.1'

2015-02-03 13:30:39 +01:00