luci-app-travelmate: sync with travelmate 0.7.2
authorDirk Brenken <dev@brenken.org>
Sun, 7 May 2017 16:57:08 +0000 (19:57 +0300)
committerHannu Nyman <hannu.nyman@iki.fi>
Sun, 7 May 2017 16:57:08 +0000 (19:57 +0300)
commitd0938f33e06c926b36811773628fea36d160218a
tree72e2971680b6badcc383eaf3fb303a91b36687b7
parent57121f37432fdc4e3eb5f577b4c3fdcb622932ee
luci-app-travelmate: sync with travelmate 0.7.2

* simplify uplink interface setup (just one Click! ;-),
  now part of the overview tab (removed separate setup page!)
* cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
Conflict resolved by Hannu Nyman
applications/luci-app-travelmate/luasrc/controller/travelmate.lua
applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua
applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
applications/luci-app-travelmate/luasrc/model/cbi/travelmate/setup_tab.lua [deleted file]