Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/master' into #462
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
  • Loading branch information
Adriána Kohanová committed Nov 26, 2020
2 parents 2775d64 + 54f1539 commit c67b599
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fragalysis-frontend",
"version": "0.9.25",
"version": "0.9.29",
"description": "Frontend for fragalysis",
"main": "webpack.config.js",
"scripts": {
Expand Down

0 comments on commit c67b599

Please sign in to comment.