Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	src/app/battery/battery.service.ts

...

This commit is contained in:

Zakary Timson 2019-12-27 01:14:34 -05:00

parent 5c4bb8b515 489f818ec8

commit d6737ed154

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available