Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into preprod/release-ng5
Browse files Browse the repository at this point in the history 
# Conflicts:
#	liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/dto/WishListDto.java
#	liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/model/WishList.java
#	liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/util/WishRules.java
#	liste-envies-war/src/main/webapp/templates/directive/WishListSettings.html
#	liste-envies-war/src/test/java/fr/desaintsteban/liste/envies/util/WishRulesTest.java
  • Loading branch information
@manudss
manudss committed Nov 8, 2020
2 parents 1b48f4b + bf05764 commit d9e1594
Show file tree
Hide file tree
Showing 7 changed files with 2,369 additions and 1,521 deletions.
Loading

0 comments on commit d9e1594

Please sign in to comment.