Merge remote-tracking branch 'origin/master' into next

Browse source

Conflicts:
	source/getting-started/automation.markdown

...

This commit is contained in:

Paulus Schoutsen 2016-05-01 23:34:04 -07:00

parent 4be4102776 16ac0e8dfb

commit de586c5433

120 changed files with 305 additions and 18 deletions

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

Download patch file Download diff file Expand all files Collapse all files

BIN

source/images/blog/2016-04-ibeacons/owntracks_beacon_setup.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 122 KiB

BIN

source/images/blog/2016-04-ibeacons/owntracks_red_beacon.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 75 KiB