Skip to content
Snippets Groups Projects
Commit de6231d8 authored by Pavel KORSHUNOV's avatar Pavel KORSHUNOV
Browse files

Merge branch 'master' into 'config-support' 

# Conflicts:
#   bob/pad/base/test/dummy/database.py
#   bob/pad/base/test/dummy/database_sql.py
parents b28bffe9 ee0abff6
Branches
No related tags found
1 merge request!13Support for configuration files
Pipeline #
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment