diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-17 18:01:44 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-17 18:01:44 -0400 |
| commit | 442a2b1a9cf8e3ca0c22b3d52397e7d9b5a6fecc (patch) | |
| tree | 178ca8db8ad5c76065c89ca5f4231c35ca648e4a | |
| parent | 1bb1b8f9ad4ea8b8ac64ecee417db960771318b2 (diff) | |
| parent | f62ef05d3c325635020e668d12e0aa0df9d6aecd (diff) | |
Merge tag 'release_2016-04-24' into archweb-generic
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | templates/public/index.html | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/requirements.txt b/requirements.txt index 6ca63480..8128b451 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin -Django==1.7.8 +Django==1.7.11 IPy==0.83 Jinja2==2.7.3 Markdown==2.6.2 diff --git a/templates/public/index.html b/templates/public/index.html index 7abd2571..a5d30687 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -138,6 +138,8 @@ title="USB keys, jewellery, case badges">Arch Schwag</a></li> <li><a href="http://www.zazzle.com/archlinux*" title="T-shirts, mugs, mouse pads, hoodies, posters, skateboards, shoes, etc.">Products via Zazzle</a></li> + <li><a href="http://www.unixstickers.com/tag/archlinux" title="Arch + Linux stickers, t-shirts, hoodies, mugs, posters and pins">Products via Unixstickers</li> <li><a href="http://www.freewear.org/?page=list_items&org=Archlinux" title="T-shirts">T-shirts via Freewear</a></li> </ul> |