Skip to content

Commit

Permalink
Merge branch 'release/v1.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Miguel committed Dec 13, 2017
2 parents 51cf40c + c2c9f34 commit 504feaf
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Controller/DataDictionaryController.php
Expand Up @@ -36,7 +36,7 @@ public function showAction()
return $this->render('@DataDictionaryBundle/DataDictionary/show.html.twig', array('tables'=>$tablesArray, 'content'=>$array));
}

public function getJsonFile($path)
protected function getJsonFile($path)
{
$files = scandir($path);

Expand Down
2 changes: 1 addition & 1 deletion README.md
@@ -1,6 +1,6 @@
![Symfony Bundle](https://symfony.com/images/v5/pictos/home-main-illu.svg)

[![Packagist](https://img.shields.io/packagist/dt/mherrera05/data-dictionary.svg?style=for-the-badge)](https://packagist.org/packages/mherrera05/data-dictionary) [![GitHub tag](https://img.shields.io/github/tag/mherrera05/data-dictionary.svg?style=for-the-badge)](https://github.com/mherrera05/data-dictionary/tags) [![Codacy grade](https://img.shields.io/codacy/grade/fc5ba48f0fac49ab87357b5575cbb965.svg?style=for-the-badge)]() [![Packagist](https://img.shields.io/packagist/l/mherrera05/data-dictionary.svg?style=for-the-badge)](https://packagist.org/packages/mherrera05/data-dictionary)
[![Packagist](https://img.shields.io/packagist/dt/mherrera05/data-dictionary.svg?style=for-the-badge)](https://packagist.org/packages/mherrera05/data-dictionary) [![GitHub tag](https://img.shields.io/github/tag/mherrera05/data-dictionary.svg?style=for-the-badge)](https://github.com/mherrera05/data-dictionary/tags) [![Codacy grade](https://img.shields.io/codacy/grade/fc5ba48f0fac49ab87357b5575cbb965.svg?style=for-the-badge)]() [![Packagist](https://img.shields.io/packagist/l/mherrera05/data-dictionary.svg?style=for-the-badge)](https://packagist.org/packages/mherrera05/data-dictionary) [![SensioLabsInsight](https://insight.sensiolabs.com/projects/27857897-b592-4d7c-b415-a5609a3636ec/big.png)](https://insight.sensiolabs.com/projects/27857897-b592-4d7c-b415-a5609a3636ec)

# Introduction

Expand Down
2 changes: 1 addition & 1 deletion Resources/views/DataDictionary/show.html.twig
Expand Up @@ -177,4 +177,4 @@
</div>
<p style="text-align: center;" class="text-muted">Generated by&nbsp;<a href="https://github.com/mherrera05/data-dictionary" class="aglio">Data Dictionary</a>&nbsp;{{'now'|date}}</p>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -20,4 +20,4 @@
"DataDictionaryBundle\\" : ""
}
}
}
}

0 comments on commit 504feaf

Please sign in to comment.