Merge commit 'b063fe0a74fdf17f440a850bbb98a2de6233a679'
authorNiki Roo <niki@nikiroo.be>
Thu, 14 May 2020 13:19:08 +0000 (15:19 +0200)
committerNiki Roo <niki@nikiroo.be>
Thu, 14 May 2020 13:19:08 +0000 (15:19 +0200)
commit8232f8836cc739e4ce27c4302f6037b66916beab
treef3e8e406ffde1d3fe678faeb82e83c1f95b0c353
parentf266631afdb6dd4cc577a520a652d23ea6424e56
parentb063fe0a74fdf17f440a850bbb98a2de6233a679
Merge commit 'b063fe0a74fdf17f440a850bbb98a2de6233a679'
src/be/nikiroo/fanfix/data/MetaData.java
src/be/nikiroo/fanfix/library/WebLibraryServer.java