Skip to content

Commit

Permalink
Merge branch 'release-5u18' into master
Browse files Browse the repository at this point in the history
# Conflicts:
#	pom.xml
  • Loading branch information
mseko committed Sep 28, 2020
2 parents de04a72 + 33dc5b2 commit cbafe0a
Show file tree
Hide file tree
Showing 77 changed files with 28 additions and 2,071 deletions.
22 changes: 0 additions & 22 deletions .idea/dictionaries/example.xml

This file was deleted.

1,038 changes: 0 additions & 1,038 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__ant_ant_1_6_5.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__asm_asm_3_1.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__asm_asm_analysis_3_1.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__asm_asm_commons_3_1.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__asm_asm_tree_3_1.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__asm_asm_util_3_1.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__asm_asm_xml_3_1.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__com_fasterxml_classmate_1_1_0.xml

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__com_google_code_findbugs_bcel_1_3_9.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__com_google_code_findbugs_findbugs_1_3_9.xml

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__com_h2database_h2_1_4_196.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit cbafe0a

Please sign in to comment.