Skip to content
This repository has been archived by the owner on Mar 26, 2024. It is now read-only.

Commit

Permalink
Merged develop into master
Browse files Browse the repository at this point in the history
  • Loading branch information
davidmigloz committed Jan 30, 2017
2 parents 34ee682 + 469eaa1 commit 23b7b7f
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
![header](https://cloud.githubusercontent.com/assets/6546265/22174630/785cdf04-dfe3-11e6-8cf4-024e8dc1c051.png)

[![GitHub Issues](https://img.shields.io/github/issues/davidmigloz/go-bees.svg)](https://github.com/davidmigloz/go-bees/issues)
[![ZenHub](https://raw.githubusercontent.com/ZenHubIO/support/master/zenhub-badge.png)](https://zenhub.com)
[![Build Status](https://travis-ci.org/davidmigloz/go-bees.svg?branch=master)](https://travis-ci.org/davidmigloz/go-bees)
[![codecov](https://codecov.io/gh/davidmigloz/go-bees/branch/master/graph/badge.svg)](https://codecov.io/gh/davidmigloz/go-bees)
[![Code Climate](https://codeclimate.com/github/davidmigloz/go-bees/badges/gpa.svg)](https://codeclimate.com/github/davidmigloz/go-bees)
Expand Down
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ sonarqube {
properties {
property "sonar.projectName", "GoBees"
property "sonar.projectKey", "com.davidmiguel.gobees"
property "sonar.projectVersion", versionName
property "sonar.projectVersion", "${android.defaultConfig.versionName}"
property "sonar.exclusions", "**/*.png,**/*.jpg"
property "sonar.android.lint.report", "./build/outputs/lint-results-mockDebug.xml"
property "sonar.junit.reportsPath", "./build/test-results/mockDebug"
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,6 @@
- Add coordinates manually.<br/>
- Update OpenCV to v3.2.0.<br/>
- Several bug fixes for Android < 5.0.<br/>
- Add Share app.<br/>
- Minor improvements and fixes.<br/><br/>
<b>Version 0.7:</b><br/>
- Spanish translation.<br/>
Expand Down

0 comments on commit 23b7b7f

Please sign in to comment.