• Ozzieisaacs's avatar
    Merge branch 'master' into Develop · b4d7733e
    Ozzieisaacs authored
    # Conflicts:
    #	cps/templates/list.html
    #	cps/translations/cs/LC_MESSAGES/messages.po
    #	cps/translations/de/LC_MESSAGES/messages.po
    #	cps/translations/es/LC_MESSAGES/messages.po
    #	cps/translations/fi/LC_MESSAGES/messages.po
    #	cps/translations/fr/LC_MESSAGES/messages.po
    #	cps/translations/hu/LC_MESSAGES/messages.po
    #	cps/translations/it/LC_MESSAGES/messages.po
    #	cps/translations/ja/LC_MESSAGES/messages.po
    #	cps/translations/km/LC_MESSAGES/messages.po
    #	cps/translations/nl/LC_MESSAGES/messages.po
    #	cps/translations/pl/LC_MESSAGES/messages.po
    #	cps/translations/ru/LC_MESSAGES/messages.po
    #	cps/translations/sv/LC_MESSAGES/messages.po
    #	cps/translations/uk/LC_MESSAGES/messages.po
    #	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
    #	messages.pot
    b4d7733e
config_sql.py 13.3 KB