snipe 0000f487ac Merge remote-tracking branch 'origin/fixes/password_confirmation_6703' into develop ...

# Conflicts:
#	config/version.php

2019-02-13 23:02:21 -08:00

..

assets

Merge branch 'develop' into dev-master-integration

2019-02-13 06:42:52 -08:00

lang

Merge remote-tracking branch 'origin/fixes/password_confirmation_6703' into develop

2019-02-13 23:02:21 -08:00

macros

Added Icelandic and Serbian to locale list

2018-09-28 11:47:59 -07:00

views

Merge remote-tracking branch 'origin/fixes/password_confirmation_6703' into develop

2019-02-13 23:02:21 -08:00