Skip to content

Commit

Permalink
Merge branch 'master' into fix_date_types
Browse files Browse the repository at this point in the history
  • Loading branch information
PavelVesnin committed May 11, 2017
2 parents 0811dc8 + 1609bfd commit 66d40cb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ env:
- MAIN_BRANCHES="master develop staging" # Branches on which you want version to be incremented
- RELEASE_BRANCH="master"
# Docker credentials
- secure: "YhW7O49bSlJ0UAlSeQ5b2PPNK6OCEjaa6JcTQFZ405d7AD5MY9ewgCHLzmEsNbZXJM/Nv0rIN58txCg+CoME/ag8gKFgrddGbjmYXrySIW4A7BYIskZmYzvExfmlw+SwG4syJUE47zzKKf0LWsrOpw5PUlXtmZm2fAcdBZ1AN+c/AopVgQAnJs6zp+3unA5VUhtAPrt7ShSGEZyHVy1++FwkBxi73qnSZIJkO4+mgVfQ8IEzyz0+/378VWx2ZR86PDIUP+bmegbewiAfysqXzJzarh0HQv+dGCHLKXeOYv2d5jeOvDXaLTdFnVXxIRkLsqJ2bO/aC/o9twKp1W/OzTbe10Dnv2nZxCvNiEPnQCUrnj5X2vhVW3fSxkohwsEceDFhNtmpSUhldQnOS7+tIhGCK95KUnVCg+qZ7ZHt70NviZkJwnp0imYGcAVO73LibEzDpZLsStJgPYnaVLKNOw2lL+3y9M9ermC0Bfzfvdr9nqEfQMgrfa7T3VIwzBd4tEMryqIgbVP43EL/XMXY0/IU5CeicKRWJ97lTINqhHcCEkfYMx0tGTUhmObUSDVN5Nbky1ilXdBMBojwNyeuJ/4wXxAG6CtmYvKQh4Gsgcr8VxM6Yp7A1MrOIc1TkI/uMw+HyT3r2+LNbjRRgfyTwQqOpnPQfqFXHZBEbF0G3wA="
- secure: "J89+7ZBGExX3cIH5NpLwPsnNsa7LhRshGMFtMrQFoAo6UwetQwx+Ezf54wQv4c8DGeRCAwJZWnYaS1SIaEKsqB7ogt4y2BXu3owSp/QFv/NKvB60Zu4aRmCVCdfXvUbOo+LCxpoJPQAoPUYcVL8uBhUslBLU7x5Dkqf8KxIGO/UewBNSn1GPZKJtx+N3s+3aji3kGsKfJZ2//7sO3t568kLENpjjiXUfqRi0OHSYQ867JmTq8hCMKAKuk9CV9747ibbLv2tXYoZPm/lWUOvdXmCDXNPM5L2K+ndAkdyYuxkkcpuEJyKeDRnW1rK6ILux0JNkjtI0Yq5Bv6ECwPD5eJ3EgcrGq/0ROmTvW1DJTHrvPBZTfA6+Wplpiu9Fxs1Z6g+xF7URbO8sbVeb0l9lbMqUlaTJ3uATKfClErC0pCm/hYRmVNshaBiiYGjoedGUK+3kuMCgr3Br9ctjP0cnN2Murwq5sxGXk7cxXAZh0sC1JhH+uls4sHDoeNjI4TRGrVJ9zkPI1S9V1mIB+6B1morT5wiIYJ3kCCLUc0eUgRDfVseTuEizc5jmPvZQN8X+n9RrJX7jmz3MUa2w4roek0E/LUq7P2smF7p7jvfDAjwvwwzYTm54t6dis9dpEoKIKcxzbdZhokhr+nhhJEvWrEvSaCOZFnAQPEoAgdPsXVA="
- secure: "tAzm9bctTBQZVMIelBNqES1WrqHUiVntxZn9TnlydFifiCREVzkZjBDstgHfS5Qd0JTTEP457x6sGguLz9SplZzE850UARJwQhVDcvp1wPr62vlpsZTZg1OsFBGkB+DAAFdvCrkFQginr69mCylaLx6lJ1Z9jgMCP0zmELpl5TLz5VO8TeErL5HPq+aHI66ey3u5XHfoTcvr/8ivUg06VMGqJRxjHY9OQSQ4xxEs0tgQ7O5qUVOljHKUeFHCwx+qs/cZEA78GR5HYunnZTTsPvOZVgtBqkq/8tcNBmuMBLvGWi4gl4c5y1yqT/yY+A9b35p8w+VI5+/rrmhZtEzgElKHQ2T8r3vl8pYyu+pUfSRLaGXrAxkRopfZx3HNkbJXZaC8dGKkPr89KKqK4W7DWp//skK5gK0SDUIABfNWgng67rmfU3uPpcqx9toKunQQC3qkIDvxY3hpnCXQqDg9hX7EKArKy0fx66PmRGIqr3QhvVXPGRXmg3zfkUMe5hXGvcv6RXY6yGrox8m/RdJKKHMvb2JddPxPSY1lS1apk7enZv+demb2GYLcR0zUvYbsB/ajKYJMhkItAQuCtJAe53sZpBZtZ6xvKsgXO+HdIM874Gd5+chSJeA1kX/4Yozeobqs1FQvqDsn41cN3/e+JwlVetBJht4ZAGjLKrkIB58="
branches:
# Releases are generated automatically, stop infinite build loop
Expand Down
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
defmodule PRM.Mixfile do
use Mix.Project

@version "0.1.39"
@version "0.1.40"

def project do
[app: :prm,
Expand Down

0 comments on commit 66d40cb

Please sign in to comment.