Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge branch '1.0'
Conflicts: slick-testkit/src/main/scala/com/typesafe/slick/testkit/tests/OldTest.scala src/main/scala/scala/slick/ast/Util.scala src/main/scala/scala/slick/compiler/Relational.scala src/main/scala/scala/slick/lifted/ColumnBase.scala src/main/scala/scala/slick/lifted/ExtensionMethods.scala src/main/scala/scala/slick/lifted/Query.scala
- Loading branch information