Skip to content

Commit

Permalink
Merge branch 'release/2.0-alpha.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
dotStart committed Jul 10, 2018
2 parents 1bd13f7 + ec15d15 commit 0150756
Show file tree
Hide file tree
Showing 12 changed files with 358 additions and 789 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APPLICATION_BRAND := vanilla
APPLICATION_VERSION := 2.0-alpha
APPLICATION_VERSION := 2.0-alpha.1
APPLICATION_COMMIT_HASH := `git log -1 --pretty=format:"%H"`
APPLICATION_TIMESTAMP := `date --utc "+%s"`

Expand Down
186 changes: 76 additions & 110 deletions rpc/common.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rpc/common.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";

package rpc;
option java_package = "tv.dotstart.stockpile";
option java_package = "io.github.dotstart.stockpile.rpc";

/**
* Represents a complete user profile.
Expand Down

0 comments on commit 0150756

Please sign in to comment.