Diffusion OCS Webserver c72dd79a30a4

Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev
c72dd79a30a4
Actions

Authored by ronaldv on Feb 19 2019, 8:57 AM.

Description

Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev

  1. Conflicts:
  2. sql_code/20190213_system_tags_update.sql

Details

Committed
ronaldvFeb 19 2019, 8:57 AM
Parents
R767:fdaf0ba59cc0: flexible tag filter
R767:9e41b83c8395: system tags
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
9e41b83c8395siyuandong
system tags 
Feb 19 2019
c7db1c08bcf5siyuandong
.gitignore 
Feb 18 2019

Changes (1)

PathPackages
Msql_code/20190213_system_tags_update.sql

R767:c72dd79a30a4

View Options

sql_code/20190213_system_tags_update.sql

Loading...