Skip to content
Snippets Groups Projects
Commit d64bfd7b authored by Demian Katz's avatar Demian Katz
Browse files

Merge branch 'release-3.1'

parents 35cd3d92 0d454210
No related merge requests found
@parent_ini = "CreatorRoles/en.ini"
@parent_ini = "HoldingStatus/en.ini"
...@@ -280,6 +280,7 @@ $config = [ ...@@ -280,6 +280,7 @@ $config = [
'session' => ['id', 'session_id_seq'], 'session' => ['id', 'session_id_seq'],
'tags' => ['id', 'tags_id_seq'], 'tags' => ['id', 'tags_id_seq'],
'user' => ['id', 'user_id_seq'], 'user' => ['id', 'user_id_seq'],
'user_card' => ['id', 'user_card_id_seq'],
'user_list' => ['id', 'user_list_id_seq'], 'user_list' => ['id', 'user_list_id_seq'],
'user_resource' => ['id', 'user_resource_id_seq'], 'user_resource' => ['id', 'user_resource_id_seq'],
], ],
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment