Skip to content

Commit

Permalink
Merge branch 'Settings' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
npofsi committed Oct 2, 2021
2 parents 31cbcba + 86d7eef commit 5b2b109
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
name: Android CI

on: [push]
on:
pull_request:
branches:
- 'master'
push:
branches:
- 'master'

jobs:
build:
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/apk.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Android Pull Request & Master CI

on:
pull_request:
branches:
- 'master'
push:
branches:
- 'master'
Expand Down

0 comments on commit 5b2b109

Please sign in to comment.