Sergio Benitez 964d0262ff Merged conflicts.

2015-09-09 13:44:51 -07:00

..

asn1-ber

…

auth

Merged conflicts.

2015-09-09 13:44:51 -07:00

avatar

…

base

…

bindata

Merged conflicts.

2015-09-09 13:44:51 -07:00

cron

work on #986 and fix a LDAP crash

2015-08-18 04:03:11 +08:00

git

…

httplib

…

identicon

…

ldap

…

log

…

mailer

…

middleware

…

process

…

setting

…

social

…

ssh

…

user

Factor out function to get the current user

2015-08-15 10:05:12 +02:00

uuid

…