Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrades Angular-audio, Mutagen and MidiJs #6912

Merged
merged 12 commits into from
Jun 21, 2019
Merged

Upgrades Angular-audio, Mutagen and MidiJs #6912

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
722f0c9
Upgrade Angular Audio and Mutagen
Jun 9, 2019
f024fc4
Merge
Jun 13, 2019
0db9e10
Add Midijs
Jun 13, 2019
044c01a
update target dir
Jun 17, 2019
9442339
Revert fsevents
Jun 17, 2019
3bbd615
Revert More of fsevent
Jun 17, 2019
80efe30
Merge remote-tracking branch 'origin/develop' into a_audio_up
Jun 17, 2019
8128bf9
Update dir
Jun 18, 2019
bc618fb
Fix lint
Jun 19, 2019
7a0f34d
Reslove Merge conflicts
Jun 19, 2019
27b9dc6
Revert Package-lock.json
Jun 19, 2019
695c14a
Merge remote-tracking branch 'origin/develop' into a_audio_up
Jun 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Reslove Merge conflicts
  • Loading branch information
NishealJ committed Jun 19, 2019
commit 7a0f34dcc8e70184c62d498efc72aefc04c0528e
2 changes: 1 addition & 1 deletion appengine_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def save(self):
os.path.join(ROOT_PATH, 'third_party', 'graphy-1.0.0'),
os.path.join(ROOT_PATH, 'third_party', 'html5lib-python-1.0.1'),
os.path.join(ROOT_PATH, 'third_party', 'mutagen-1.42.0'),
os.path.join(ROOT_PATH, 'third_party', 'requests-2.10.0'),
os.path.join(ROOT_PATH, 'third_party', 'requests-2.22.0'),
os.path.join(ROOT_PATH, 'third_party', 'simplejson-3.16.0'),
os.path.join(ROOT_PATH, 'third_party', 'six-1.12.0'),
os.path.join(ROOT_PATH, 'third_party', 'soupsieve-1.9.1'),
Expand Down
2 changes: 1 addition & 1 deletion core/tests/gae_suite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
os.path.join(THIRD_PARTY_DIR, 'graphy-1.0.0'),
os.path.join(THIRD_PARTY_DIR, 'html5lib-python-1.0.1'),
os.path.join(THIRD_PARTY_DIR, 'mutagen-1.42.0'),
os.path.join(THIRD_PARTY_DIR, 'requests-2.10.0'),
os.path.join(THIRD_PARTY_DIR, 'requests-2.22.0'),
os.path.join(THIRD_PARTY_DIR, 'simplejson-3.16.0'),
os.path.join(THIRD_PARTY_DIR, 'six-1.12.0'),
os.path.join(THIRD_PARTY_DIR, 'soupsieve-1.9.1'),
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.