Merge branch 'master' into qa

* master:
  oops, should have bumped version number after merging pull requests
  add relocated behavior file with updated copyright
  enable huffpostslides.js
This commit is contained in:
Noah Levitt 2017-06-07 08:52:12 -07:00
commit 99c8ebcc8b
2 changed files with 2 additions and 2 deletions

View File

@ -2,7 +2,7 @@
* brozzler/behaviors.d/huffpostslides.js - from article, start slideshow and
* click through end
*
* Copyright (C) 2014-2016 Internet Archive
* Copyright (C) 2014-2017 Internet Archive
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

View File

@ -32,7 +32,7 @@ def find_package_data(package):
setuptools.setup(
name='brozzler',
version='1.1b11.dev252',
version='1.1b11.dev253',
description='Distributed web crawling with browsers',
url='https://github.com/internetarchive/brozzler',
author='Noah Levitt',