Skip to content

Commit

Permalink
Merge branch '1_2_2'
Browse files Browse the repository at this point in the history
  • Loading branch information
drewolson committed May 26, 2017
2 parents 90929a8 + 2c128a5 commit 7e4f9ef
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## 1.3.0-dev

## 1.2.2

* Require Elixir `~> 1.3`

## 1.2.1

* Return `total_pages` of `1` when there are no results
Expand Down
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ defmodule Scrivener.Ecto.Mixfile do
[
app: :scrivener_ecto,
version: "1.3.0-dev",
elixir: "~> 1.2",
elixir: "~> 1.3",
elixirc_paths: elixirc_paths(Mix.env),
package: package(),
description: "Paginate your Ecto queries with Scrivener",
Expand Down

0 comments on commit 7e4f9ef

Please sign in to comment.