diff options
| author | cyanos3 <[email protected]> | 2013-11-05 22:22:15 -0700 |
|---|---|---|
| committer | cyanos3 <[email protected]> | 2013-11-05 22:22:15 -0700 |
| commit | 6453ba2e877aa71fe1347c66de0c566dfde80f51 (patch) | |
| tree | 3aee5f258d7fd98a1ae79a0d7db4f88a96b7ffaa /examples | |
| parent | ff1c1942e5e1d46f00d8c87664909f88bde94d34 (diff) | |
| parent | 2f88856eebb49fa13db2ee5c881db118fe347b08 (diff) | |
| download | faker-6453ba2e877aa71fe1347c66de0c566dfde80f51.tar.xz faker-6453ba2e877aa71fe1347c66de0c566dfde80f51.zip | |
Merge branch 'master' of https://github.com/cyanos/Faker.js
Conflicts:
Faker.js
MinFaker.js
Readme.md
examples/js/Faker.js
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/js/Faker.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/js/Faker.js b/examples/js/Faker.js index 3495218a..68773f69 100644 --- a/examples/js/Faker.js +++ b/examples/js/Faker.js @@ -21,7 +21,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/*************** AUTOGENERATED @ 1383711940929 *************** +/*************** AUTOGENERATED @ 1383715307837 *************** WARNING: THIS FILE WAS AUTOGENERATED BY THE FAKER BUILD SCRIPT MODIFYING THIS FILE IS FINE, BUT YOU REALLY SHOULD BE MODIFYING |