diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-08-13 20:41:30 -0400 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-08-13 20:41:30 -0400 |
| commit | 653ceaa3de4944c7c4788577c61ce8597ce9a8ae (patch) | |
| tree | b580e2aca6dd8b68004893b66e49305e950bc1c4 /version.sbt | |
| parent | f774c4736545e1584f74b87c0a7d74d2ba6a07aa (diff) | |
| parent | 79ccffe3fff870d8a9338576eff6caad7ed69992 (diff) | |
| download | Kamon-653ceaa3de4944c7c4788577c61ce8597ce9a8ae.tar.gz Kamon-653ceaa3de4944c7c4788577c61ce8597ce9a8ae.tar.bz2 Kamon-653ceaa3de4944c7c4788577c61ce8597ce9a8ae.zip | |
Merge branch 'master' into release-0.2
Conflicts:
kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala
version.sbt
Diffstat (limited to 'version.sbt')
0 files changed, 0 insertions, 0 deletions