cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-10 19:57:09 +03:00
Code Issues Packages Projects Releases Wiki Activity
7,960 Commits 15 Branches 575 Tags 23 MiB
master
Commit Graph

666 Commits

Author SHA1 Message Date
pyup.io bot
c7055f38b8 Update tox from 3.2.1 to 3.4.0 (#1811) 2018-09-21 16:02:29 +00:00
pyup-bot
cd8bab5fdc Update pytest from 3.7.4 to 3.8.0 2018-09-06 18:39:20 -07:00
pyup-bot
20931dfb6f Update pytest from 3.7.3 to 3.7.4 2018-08-30 03:17:42 -07:00
pyup.io bot
967bdb89c3 Update pytest to 3.7.3 (#1764) 
* Update pytest from 3.7.2 to 3.7.3

* Update pytest from 3.7.2 to 3.7.3
 2018-08-27 19:56:08 +00:00
pyup.io bot
eb8e2a33c8 Update pytest to 3.7.2 (#1755) 
This PR updates [pytest](https://pypi.org/project/pytest) from **3.7.1** to **3.7.2**.



<details>
  <summary>Changelog</summary>
  
  
   ### 3.7.2
   ```
   =========================

Bug Fixes
---------

- `3671 &lt;https://github.com/pytest-dev/pytest/issues/3671&gt;`_: Fix ``filterwarnings`` not being registered as a builtin mark.


- `3768 &lt;https://github.com/pytest-dev/pytest/issues/3768&gt;`_, `3789 &lt;https://github.com/pytest-dev/pytest/issues/3789&gt;`_: Fix test collection from packages mixed with normal directories.


- `3771 &lt;https://github.com/pytest-dev/pytest/issues/3771&gt;`_: Fix infinite recursion during collection if a ``pytest_ignore_collect`` hook returns ``False`` instead of ``None``.


- `3774 &lt;https://github.com/pytest-dev/pytest/issues/3774&gt;`_: Fix bug where decorated fixtures would lose functionality (for example ``mock.patch``).


- `3775 &lt;https://github.com/pytest-dev/pytest/issues/3775&gt;`_: Fix bug where importing modules or other objects with prefix ``pytest_`` prefix would raise a ``PluginValidationError``.


- `3788 &lt;https://github.com/pytest-dev/pytest/issues/3788&gt;`_: Fix ``AttributeError`` during teardown of ``TestCase`` subclasses which raise an exception during ``__init__``.


- `3804 &lt;https://github.com/pytest-dev/pytest/issues/3804&gt;`_: Fix traceback reporting for exceptions with ``__cause__`` cycles.



Improved Documentation
----------------------

- `3746 &lt;https://github.com/pytest-dev/pytest/issues/3746&gt;`_: Add documentation for ``metafunc.config`` that had been mistakenly hidden.
   ```
   
  
</details>


 

<details>
  <summary>Links</summary>
  
  - PyPI: https://pypi.org/project/pytest
  - Changelog: https://pyup.io/changelogs/pytest/
  - Homepage: http://pytest.org
</details>
 2018-08-19 13:19:11 +08:00
pyup.io bot
d726202cae Update tox from 3.1.3 to 3.2.1 (#1744) 2018-08-13 16:02:24 +03:00
pyup-bot
7401be4de0 Update tox from 3.1.2 to 3.1.3 2018-08-04 03:40:02 -05:00
pyup-bot
0aa761ef45 Update pytest from 3.6.4 to 3.7.1 2018-08-03 02:04:59 -07:00
pyup.io bot
6c2a130e3d Update pytest to 3.6.4 (#1731) 
* Update pytest from 3.6.3 to 3.6.4

* Update pytest from 3.6.3 to 3.6.4
 2018-07-29 14:12:41 +03:00
pyup.io bot
e6d33da298 Update tox from 3.1.1 to 3.1.2 (#1718) 2018-07-13 12:05:02 +08:00
pyup.io bot
494492b1db Update tox to 3.1.1 (#1715) 
This PR updates [tox](https://pypi.org/project/tox) from **3.0.0** to **3.1.1**.



<details>
  <summary>Changelog</summary>
  
  
   ### 3.1.0
   ```
   ------------------

Bugfixes
^^^^^^^^

- Add ``ignore_basepython_conflict``, which determines whether conflicting
  ``basepython`` settings for environments containing default factors, such as
  ``py27`` or ``django18-py35``, should be ignored or result in warnings. This
  was a common source of misconfiguration and is rarely, if ever, desirable from
  a user perspective - by :user:`stephenfin` (`477 &lt;https://github.com/tox-dev/tox/issues/477&gt;`_)
- Fix bug with incorrectly defactorized dependencies (deps passed to pip were not de-factorized) - by :user:`bartsanchez` (`706 &lt;https://github.com/tox-dev/tox/issues/706&gt;`_)


Features
^^^^^^^^

- Add support for multiple PyPy versions using default factors. This allows you
  to use, for example, ``pypy27`` knowing that the correct intepreter will be
  used by default - by :user:`stephenfin` (`19 &lt;https://github.com/tox-dev/tox/issues/19&gt;`_)
- Add support to explicitly invoke interpreter directives for environments with
  long path lengths. In the event that ``tox`` cannot invoke scripts with a
  system-limited shebang (e.x. a Linux host running a Jenkins Pipeline), a user
  can set the environment variable ``TOX_LIMITED_SHEBANG`` to workaround the
  system&#39;s limitation (e.x. ``export TOX_LIMITED_SHEBANG=1``) - by :user:`jdknight` (`794 &lt;https://github.com/tox-dev/tox/issues/794&gt;`_)
- introduce a constants module to be used internally and as experimental API - by :user:`obestwalter` (`798 &lt;https://github.com/tox-dev/tox/issues/798&gt;`_)
- Make ``py2`` and ``py3`` aliases also resolve via ``py`` on windows by :user:`asottile`. This enables the following things:
  ``tox -e py2`` and ``tox -e py3`` work on windows (they already work on posix); and setting ``basepython=python2`` or ``basepython=python3`` now works on windows. (`856 &lt;https://github.com/tox-dev/tox/issues/856&gt;`_)
- Replace the internal version parsing logic from the not well tested `PEP-386 &lt;https://www.python.org/dev/peps/pep-0386/&gt;`_ parser for the more general `PEP-440 &lt;https://www.python.org/dev/peps/pep-0440/&gt;`_. `packaging &gt;= 17.1 &lt;https://pypi.org/project/packaging/&gt;`_ is now an install dependency by :user:`gaborbernat`. (`860 &lt;https://github.com/tox-dev/tox/issues/860&gt;`_)


Documentation
^^^^^^^^^^^^^

- extend the plugin documentation and make lot of small fixes and improvements - by :user:`obestwalter` (`797 &lt;https://github.com/tox-dev/tox/issues/797&gt;`_)
- tidy up tests - remove unused fixtures, update old cinstructs, etc. - by :user:`obestwalter` (`799 &lt;https://github.com/tox-dev/tox/issues/799&gt;`_)
- Various improvements to documentation: open browser once documentation generation is done, show Github/Travis info on documentation page, remove duplicate header for changelog, generate unreleased news as DRAFT on top of changelog, make the changelog page more compact and readable (width up to 1280px) by :user:`gaborbernat` (`859 &lt;https://github.com/tox-dev/tox/issues/859&gt;`_)


Miscellaneous
^^^^^^^^^^^^^

- filter out unwanted files in package - by :user:`obestwalter` (`754 &lt;https://github.com/tox-dev/tox/issues/754&gt;`_)
- make the already existing implicit API explicit - by :user:`obestwalter` (`800 &lt;https://github.com/tox-dev/tox/issues/800&gt;`_)
- improve tox quickstart and corresponding tests - by :user:`obestwalter` (`801 &lt;https://github.com/tox-dev/tox/issues/801&gt;`_)
- tweak codecov settings via .codecov.yml - by :user:`obestwalter` (`802 &lt;https://github.com/tox-dev/tox/issues/802&gt;`_)
   ```
   
  
</details>


 

<details>
  <summary>Links</summary>
  
  - PyPI: https://pypi.org/project/tox
  - Changelog: https://pyup.io/changelogs/tox/
  - Docs: https://tox.readthedocs.org/
</details>
 2018-07-10 10:27:59 +08:00
pyup.io bot
f92acfacc4 Update pytest to 3.6.3 (#1709) 
* Update pytest from 3.6.2 to 3.6.3

* Update pytest from 3.6.2 to 3.6.3
 2018-07-05 17:41:25 +03:00
pyup.io bot
75a0699848 Update pytest to 3.6.2 (#1690) 
This PR updates [pytest](https://pypi.org/project/pytest) from **3.6.1** to **3.6.2**.



*The bot wasn't able to find a changelog for this release. [Got an idea?](https://github.com/pyupio/changelogs/issues/new)*

<details>
  <summary>Links</summary>
  
  - PyPI: https://pypi.org/project/pytest
  - Changelog: https://pyup.io/changelogs/pytest/
  - Repo: https://github.com/pytest-dev/pytest/issues
  - Homepage: http://pytest.org
</details>
 2018-06-21 11:00:47 +08:00
pyup.io bot
0ff3236ce4 Update pytest to 3.6.1 (#1675) 
* Update pytest from 3.6.0 to 3.6.1

* Update pytest from 3.6.0 to 3.6.1
 2018-06-06 09:38:28 +03:00
pyup.io bot
39d897169c Update pytest to 3.6.0 (#1662) 
* Update pytest from 3.5.1 to 3.6.0

* Update pytest from 3.5.1 to 3.6.0
 2018-05-25 10:31:33 +03:00
Nikita P. Shupeyko
5e2a907c35 Remove pycodestyle and pyflakes as implicit dependencies from flakes8 
Closes  #1606.
 2018-05-05 12:42:10 +03:00
pyup-bot
1ed61dafc2 Update pytest from 3.5.0 to 3.5.1 2018-04-25 03:24:50 -07:00
pyup.io bot
7465c3a8a8 Update tox from 2.9.1 to 3.0.0 (#1591) 2018-04-03 09:51:17 +08:00
pyup.io bot
3264e77696 Update pytest to 3.5.0 (#1580) 
* Update pytest from 3.4.2 to 3.5.0

* Update pytest from 3.4.2 to 3.5.0
 2018-03-25 15:30:58 +03:00
Nikita P. Shupeyko
6574abb141 Clean up requirements.txt 2018-03-07 17:06:29 +03:00
Nikita Shupeyko
d2791b019a
Prettify and re-order settings entries (#1550) 
* Prettify and re-order settings entries

* Use old-style .format() for the time being

* Remove redundant linebreaks at the settings files' beginning

* Fix E303 too many blank lines

* Remove a redundant linebreak from requirements.txt

* Some linebreake juggling in config.settings.base
 2018-03-06 14:28:25 +03:00
pyup.io bot
5a20dce431 Update pytest from 3.4.1 to 3.4.2 (#1549) 2018-03-06 11:22:44 +03:00
Nikita P. Shupeyko
d2964faa54 Re-order requirements.txt 2018-03-05 14:01:45 +03:00
Nikita P. Shupeyko
8dd9e691b1 Group requirements from requirements.txt 2018-03-04 17:52:48 +03:00
pyup.io bot
a252830c31 Update pytest from 3.3.2 to 3.4.1 (#1523) 2018-02-22 18:03:25 +03:00
pyup.io bot
44e90477a5 Update pytest from 3.3.1 to 3.3.2 (#1433) 2018-01-05 19:20:00 +03:00
pyup.io bot
9a978ef0fe Update pytest from 3.2.5 to 3.3.1 (#1399) 2017-12-13 15:25:22 +03:00
pyup.io bot
2e672856be Update pytest from 3.2.3 to 3.2.5 (#1390) 2017-11-20 13:10:53 +03:00
pyup.io bot
26300237c9 Update flake8 to 3.5.0 (#1370) 
* Update flake8 from 3.4.1 to 3.5.0

* Update flake8 from 3.4.1 to 3.5.0
 2017-10-24 21:13:10 +03:00
pyup.io bot
7e5dde149f Update pytest-cookies from 0.2.0 to 0.3.0 (#1360) 2017-10-16 18:28:51 +03:00
pyup-bot
6364da8b8a Update cookiecutter from 1.5.1 to 1.6.0 2017-10-15 12:37:16 -07:00
pyup.io bot
6f51b05b6e Update pytest from 3.2.2 to 3.2.3 (#1354) 2017-10-06 00:27:09 +03:00
pyup.io bot
dea64ad60a Update tox from 2.9.0 to 2.9.1 (#1349) 2017-09-30 15:46:19 +03:00
pyup-bot
7fba13f0c0 Update tox from 2.8.2 to 2.9.0 2017-09-29 10:14:41 -07:00
Rafael Laverde
1d55a608c0 Change pep 8 for pycodestyle in docs and project requirements (#1332) 
* Change pep8 for pycodestyle in the docs.

* Change pep8 for pycodestyle in project requirements.
 2017-09-17 21:56:15 +03:00
pyup.io bot
336c1491e1 Update tox from 2.8.1 to 2.8.2 (#1328) 2017-09-11 09:55:42 +03:00
pyup.io bot
7223aacb2c Update pytest from 3.2.1 to 3.2.2 (#1326) 2017-09-08 09:53:48 +03:00
pyup.io bot
7aa99c6ae3 Update tox from 2.8.0 to 2.8.1 (#1318) 2017-09-04 20:24:44 +03:00
pyup.io bot
2fc3bfd442 Update tox from 2.7.0 to 2.8.0 (#1313) 2017-09-02 09:06:36 +03:00
pyup-bot
16f6677de8 Update pytest from 3.2.0 to 3.2.1 2017-08-09 20:03:27 -07:00
pyup.io bot
c90480b6df Update binaryornot from 0.4.3 to 0.4.4 (#1274) 2017-08-03 19:29:01 +03:00
pyup.io bot
0e6b5f3c66 Update pyflakes from 1.5.0 to 1.6.0 (#1275) 2017-08-03 19:28:48 +03:00
pyup.io bot
c5ed6173b2 Update pytest from 3.1.3 to 3.2.0 (#1271) 2017-08-02 08:15:51 +03:00
pyup.io bot
993aac6b95 Update flake8 to 3.4.1 (#1254) 
* Update flake8 from 3.4.0 to 3.4.1

* Update flake8 from 3.4.0 to 3.4.1
 2017-07-29 05:57:27 +03:00
pyup.io bot
e7ae16eeb6 Update flake8 to 3.4.0 (#1253) 
* Update flake8 from 3.3.0 to 3.4.0

* Update flake8 from 3.3.0 to 3.4.0
 2017-07-28 11:16:01 +03:00
pyup.io bot
43b8e96cd3 Update pytest from 3.1.2 to 3.1.3 (#1218) 2017-07-05 10:30:24 +03:00
pyup.io bot
d34aa71038 Update pytest from 3.1.1 to 3.1.2 (#1190) 2017-06-10 13:10:46 +03:00
pyup-bot
847a5fdbc6 Update sh from 1.12.13 to 1.12.14 2017-06-06 20:19:10 -07:00
pyup.io bot
85782f72af Update pytest from 3.1.0 to 3.1.1 (#1183) 2017-05-31 21:54:41 +03:00
pyup.io bot
cb46ed4584 Update pytest from 3.0.7 to 3.1.0 (#1178) 2017-05-26 23:22:16 +03:00
pyup.io bot
f7ca4d712c Update tox from 2.6.0 to 2.7.0 (#1113) 2017-04-13 10:54:18 -07:00
pyup.io bot
667d4df01d Update binaryornot from 0.4.2 to 0.4.3 (#1120) 2017-04-12 13:55:42 -07:00
pyup-bot
cbb55a73b8 Update binaryornot from 0.4.0 to 0.4.2 2017-04-12 11:17:55 -07:00
pyup.io bot
1a82a2a3af Update sh from 1.12.10 to 1.12.13 (#1100) 2017-04-01 18:09:29 +02:00
pyup.io bot
5965bbeaa4 Update pytest from 3.0.6 to 3.0.7 (#1078) 2017-03-24 11:27:46 +01:00
Burhan Khalid
04146d580e version bumps 2017-03-03 09:11:54 +03:00
pyup.io bot
9bc7027fb0 Update cookiecutter from 1.5.0 to 1.5.1 (#1018) 2017-02-09 09:09:19 +01:00
pyup.io bot
19a4de576a Update tox from 2.5.0 to 2.6.0 (#1017) 2017-02-09 09:08:43 +01:00
pyup.io bot
515e55c5ab Update pytest from 3.0.5 to 3.0.6 (#1003) 2017-01-26 16:16:08 +01:00
pyup.io bot
580d90a4be Update pyflakes from 1.4.0 to 1.5.0 (#986) 2017-01-11 08:45:28 +01:00
pyup.io bot
ced25f1f39 Update sh from 1.12.8 to 1.12.9 (#980) 2017-01-09 10:31:11 +01:00
pyup.io bot
79371f4b00 Update pyflakes from 1.3.0 to 1.4.0 (#967) 2016-12-30 23:05:16 +01:00
pyup.io bot
8f1a6e20e4 Update cookiecutter from 1.4.0 to 1.5.0 (#952) 2016-12-18 23:13:09 +01:00
pyup.io bot
dc559f7649 Update sh from 1.12.7 to 1.12.8 (#946) 2016-12-17 12:07:38 +01:00
pyup.io bot
2838789560 Update sh from 1.12.6 to 1.12.7 (#929) 2016-12-08 19:14:18 -08:00
pyup.io bot
75d8827681 Update pytest from 3.0.4 to 3.0.5 (#924) 2016-12-06 20:44:20 -08:00
pyup.io bot
275e0b4b8c Update sh from 1.12.5 to 1.12.6 (#922) 2016-12-06 20:44:10 -08:00
pyup.io bot
269efc3f45 Update sh from 1.12.2 to 1.12.5 (#919) 2016-12-01 11:19:49 +01:00
pyup.io bot
605c7eae63 Update sh from 1.11 to 1.12.2 (#913) 2016-11-29 09:07:34 -08:00
pyup.io bot
efad688671 Update flake8 to 3.2.1 (#900) 
* Update flake8 from 3.2.0 to 3.2.1

* Update flake8 from 3.2.0 to 3.2.1
 2016-11-23 11:36:31 +01:00
pyup.io bot
d5805a71b4 Update tox from 2.4.1 to 2.5.0 (#890) 2016-11-23 11:36:24 +01:00
pyup.io bot
b32a2ed8aa Update flake8 to 3.2.0 (#888) 
* Update flake8 from 3.0.4 to 3.2.0

* Update flake8 from 3.0.4 to 3.2.0
 2016-11-16 09:32:50 +01:00
pyup.io bot
629ab3a956 Update pytest from 3.0.3 to 3.0.4 (#883) 2016-11-14 11:52:38 +01:00
pyup.io bot
75b7cc9640 Update tox from 2.3.1 to 2.4.1 (#848) 2016-10-17 09:56:15 -07:00
pyup-bot
772d7783a4 Update pytest from 3.0.2 to 3.0.3 2016-09-29 15:41:18 -07:00
Jannis Gebauer
22152a87c2 Merge pull request #771 from pydanny/pyup-update-pyflakes-1.2.3-to-1.3.0 
Update pyflakes to 1.3.0
 2016-09-02 09:48:06 +02:00
pyup-bot
e4d0b922ab Update pytest from 3.0.1 to 3.0.2 2016-09-01 17:20:06 -07:00
pyup-bot
e5ff8c1379 Update pyflakes from 1.2.3 to 1.3.0 2016-09-01 13:05:03 -07:00
pyup-bot
c2b795ad03 Update pytest from 2.9.2 to 3.0.1 2016-08-23 17:28:33 -07:00
pyup-bot
a8981a3cc4 Update flake8 from 3.0.3 to 3.0.4 2016-08-08 03:48:54 -07:00
pyup-bot
39b706cbd6 Update flake8 from 3.0.1 to 3.0.3 2016-07-30 05:02:58 -07:00
pyup-bot
04587f9374 Update flake8 from 3.0.0 to 3.0.1 2016-07-25 17:55:05 -07:00
pyup-bot
af5bb8cd1a Update flake8 from 2.6.2 to 3.0.0 2016-07-25 04:25:00 -07:00
pyup-bot
cbc0a3a704 Update flake8 from 2.5.5 to 2.6.2 2016-06-27 04:24:18 +08:00
Jannis Gebauer
d771f12a55 ignore flake8 2.6.0, closes #635 2016-06-18 22:30:08 +02:00
Jannis Gebauer
7bc86bb13b Revert "Update flake8 to 2.6.0" 2016-06-18 10:10:15 +02:00
pyup.io bot
30bfba71bc Update flake8 to 2.6.0 (#625) 
* Update flake8 from 2.5.5 to 2.6.0

* Update flake8 from 2.5.5 to 2.6.0
 2016-06-15 17:57:04 -07:00
pyup-bot
3e9e8c3bae Update flake8 from 2.5.4 to 2.5.5 2016-06-14 08:47:24 -07:00
requires.io
df56488f01 [requires.io] dependency update 2016-06-05 16:30:17 -07:00
Fabio C. Barrioneuvo da Luz
0601795f68 update requirements and changelog 2016-05-13 00:13:42 -03:00
Fabio C. Barrioneuvo da Luz
d79e09d0e2 update version of pyflakes 2016-05-09 17:38:14 -03:00
Daniel Roy Greenfeld
d537268b8d Update requirements 2016-05-05 21:53:08 -07:00
Audrey Roy Greenfeld
5517bdd1bc Update requirements 2016-04-25 22:59:02 -07:00
Daniel Roy Greenfeld
8992bc4f70 Updated test requirements 2016-04-20 11:50:06 -07:00
Fabio C. Barrioneuvo da Luz
9ea65968c1 update requirements 2016-03-01 22:13:07 -03:00
Fabio C. Barrioneuvo da Luz
5c9b01ae87 update flake8 version 2016-01-30 17:32:01 -03:00
Fabio C. Barrioneuvo da Luz
8b82f2a804 update version of dependencies 2016-01-29 02:42:45 -03:00
Audrey Roy Greenfeld
59a6c637ac Remove debugging tools from non-generated part of project, since those are personal prefs. 2015-11-25 08:33:06 -08:00
Fabio C. Barrioneuvo da Luz
0ef11d1818 sh package version pinned to 1.11 2015-11-23 23:11:52 -03:00
Fabio C. Barrioneuvo da Luz
6092145760 update requirements 2015-11-23 21:15:11 -03:00
Raphael Pierzina
b68e89279f Add tox v2.1.1 to requirements.txt 2015-11-09 00:35:21 +01:00
Audrey Roy Greenfeld
7e8f58d6ec Fix test failure due to favicon.ico being opened by DjangoCookieTestCase.check_paths(). 2015-11-06 19:44:10 -08:00
Fabio C. Barrionuevo da Luz
dbe5bcc690 update requirements 2015-11-04 23:24:49 -03:00
Fabio C. Barrioneuvo da Luz
0fb5f5d854 Update version of requirements 
cookiecutter, coverage, django-environ, django-extensions, hitchpython, hitchselenium, hitchserve, pytest, pytz, whitenoise
 2015-09-30 15:10:12 -03:00
Jannis Gebauer
25326d5560 added pyflakes and pep8 to requirements (used for testing) 2015-09-30 10:37:46 +02:00
Audrey Roy Greenfeld
332f746d27 Update outdated requirements. 2015-09-18 15:22:35 -07:00
Daniel Roy Greenfeld
f573fbcb7d Changed requirements files to match current dependency versions 2015-08-20 22:08:40 -07:00
Fabio C. Barrioneuvo da Luz
dca0a016cf update ipython to 3.2.1 and django-allauth to 0.22.0 2015-07-27 08:36:45 -03:00
Fábio C. Barrionuevo da Luz
c61c58dbd2 update pytest version to 2.7.2 2015-06-23 21:40:55 -03:00
Fabio C. Barrioneuvo da Luz
009f6b79a4 update ipython version to 3.2.0 
whitenoise version to 2.0
coverage version to 4.0a6
 2015-06-22 09:21:16 -03:00
Fábio C. Barrionuevo da Luz
7d1e4bd8d2 update ipdb version to 0.8.1 2015-06-03 17:20:55 -03:00
Fabio C. Barrionuevo da Luz
00f3a5cfff update flake8 version to 2.4.1, pytest to 2.7.1 and django-autoslug to 1.8.0 2015-05-19 12:39:21 -03:00
Saurabh Kumar
43d33dc025 Add DjangoCookieTestCase 2015-04-20 18:03:28 +05:30
Daniel Greenfeld
c8a01b6bad Fix the layout to match the cookie cutter pattern 2013-08-15 20:03:08 +02:00
Daniel Greenfeld
988b4f8a46 Getting pieces to work 2013-08-15 19:47:35 +02:00
Daniel Greenfeld
b24dc7259c Bring over a bunch of stuff from two scoops project 2013-08-14 20:01:41 +02:00