Skip to content

Commit

Permalink
Merge branch 'develop' into tgm-incoming-txns
Browse files Browse the repository at this point in the history
# Conflicts:
#	app/scripts/controllers/incoming-transactions.js
  • Loading branch information
tgmichel committed Feb 8, 2023
2 parents 5916f47 + 4cb2e57 commit 14d3b8c
Show file tree
Hide file tree
Showing 2,040 changed files with 134,640 additions and 111,734 deletions.
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
chrome >= 66, firefox >= 68
Loading

0 comments on commit 14d3b8c

Please sign in to comment.