diff options
| author | marcinzelent <zelent.marcin@gmail.com> | 2017-11-30 11:34:01 +0100 | 
|---|---|---|
| committer | marcinzelent <zelent.marcin@gmail.com> | 2017-11-30 11:34:01 +0100 | 
| commit | 2210e09dd3b70106a0a4ce2d963d28171a5ee579 (patch) | |
| tree | 719a3681c95837a760ffb9438d0eb9e5c92886c7 /app | |
| parent | 8a67529d0358af8b1c72f53c2ca6441c75be836d (diff) | |
| parent | f7e9434a00b9001d16a28f3aaab4d4b0696dc12c (diff) | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/workspace.xml
Diffstat (limited to 'app')
| -rw-r--r-- | app/Resources/views/default/index.html.twig | 2 | 
1 files changed, 2 insertions, 0 deletions
| diff --git a/app/Resources/views/default/index.html.twig b/app/Resources/views/default/index.html.twig index 36180cb..1ec4bd6 100644 --- a/app/Resources/views/default/index.html.twig +++ b/app/Resources/views/default/index.html.twig @@ -17,6 +17,8 @@              </tr>          </table>      </div> +    <p id="aq"></p> +    <img src="https://www.ourair.org/wp-content/uploads/AQItable.gif">  {% endblock %}  {% block javascripts %}      <script src="{{ asset('js/realtime.js') }}"></script> |