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.

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

Revert "Update to latest API+tools+gradle+misc. (#268)" #280

Merged
merged 1 commit into from
Apr 9, 2017
Merged

Revert "Update to latest API+tools+gradle+misc. (#268)" #280

merged 1 commit into from
Apr 9, 2017

Conversation

digitaldan
Copy link
Contributor

This reverts commit 7e405c5. From PR #268

@digitaldan digitaldan merged commit ab64c99 into openhab:master Apr 9, 2017
mgarciate pushed a commit to mgarciate/openhab.android that referenced this pull request May 22, 2017
* 'master' of https://github.com/openhab/openhab.android: (31 commits)
  Do not start discovery service if only remote url is configured (openhab#291)
  Implement dynamic GCM sender ID (openhab#288)
  Updates gradle plugin to latest 2.4.0-alpha7 (openhab#296)
  Update to latest API+tools+gradle+misc.  (try openhab#2) (openhab#281)
  set default theme to light (openhab#292)
  make "icon format" in settings translatable (openhab#293)
  Make a few strings non-translatable (openhab#277)
  Revert "Update to latest API+tools+gradle+misc. (openhab#268)" (openhab#280)
  More consistent strings (openhab#276)
  Update to latest API+tools+gradle+misc. (openhab#268)
  Bump verion for next relese (openhab#273)
  References openhab#117 - restore NFC functionality to Switch items (openhab#267)
  Add Lithuanian translation (openhab#272)
  Support for icons in svg format (openhab#256)
  Improve WebView compatibility by enabling DOM storage (openhab#266)
  Fix attempt at openhab#116 (openhab#262)
  Added Japanese translation (openhab#254)
  updated german translation (openhab#259)
  Bump version for next release.
  Signed-off-by: Cristian Sarac <sarac.cristian@gmaill.com> github: CristianSarac (openhab#226)
  ...

# Conflicts:
#	mobile/src/main/res/values-es/strings.xml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant